summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2010-11-13 22:18:22 -0500
committerKyle McMartin <kyle@mcmartin.ca>2010-11-13 22:18:22 -0500
commit1d6dcd2719d378a507a5369c6017e8f616333f06 (patch)
tree399a7c2c89b660a67f73bcdba5c06d2bc6f9acc9 /.gitignore
parent8383538959a3705b40f1f533e1da3145dbbb7a7f (diff)
downloadkernel-1d6dcd2719d378a507a5369c6017e8f616333f06.tar.gz
kernel-1d6dcd2719d378a507a5369c6017e8f616333f06.tar.xz
kernel-1d6dcd2719d378a507a5369c6017e8f616333f06.zip
Merge 2.6.37-rc1-git10
- Pull in 2.6.37-rc1-git10 snapshot - SECURITY_DMESG_RESTRICT added, the principle of least surprise dictates we should probably have it off. If you want to restrict dmesg access you may use the kernel.dmesg_restrict sysctl. - linux-2.6-bluetooth-autosuspend.patch: merged upstream.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 49bbef401..165240bfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@ clog
*.rpm
kernel-2.6.*/
/patch-2.6.37-rc1.bz2
-/patch-2.6.37-rc1-git7.bz2
+/patch-2.6.37-rc1-git10.bz2