[kernel/rawhide/user/myoung/xendom0: 4/5] Merge branch 'rawhide/user/kyle/kernel-git' into rawhide/user/myoung/xendom0

[myoung]

commit c43c10888a9cc37aabc1459ca8a350ae5cef3588
Merge: 0e092ef 754832d
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Tue Nov 16 19:36:23 2010 +0000

    Merge branch 'rawhide/user/kyle/kernel-git' into rawhide/user/myoung/xendom0
    
    Conflicts:
    	kernel.spec

 .gitignore                            |    3 +-
 config-generic                        |    3 +
 hdpvr-ir-enable.patch                 |   11 +++
 kernel.spec                           |   16 +++-
 linux-2.6-bluetooth-autosuspend.patch |  159 ---------------------------------
 sources                               |    3 +-
 6 files changed, 30 insertions(+), 165 deletions(-)
---
diff --cc kernel.spec
index 518dd2f,6a5c2a2..4259f1a
--- a/kernel.spec
+++ b/kernel.spec
@@@ -1918,13 -1899,16 +1916,23 @@@ f
  #                 ||     ||
  
  %changelog
+ * Mon Nov 15 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.1.rc2.git0
+ - Linux 2.6.37-rc2
+ 
+ * Sat Nov 13 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.1.rc1.git10
+ - Linux 2.6.37-rc1-git10
+ - 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.
+ 
 +* Fri Nov 12 2010 Michael Young <m.a.young at durham.ac.uk>
 +- Try again with xen patches from xen/next-2.6.37
 +- Build new XEN_GNTDEV option as a module
 +
 +* Thu Nov 11 2010 Michael Young <m.a.young at durham.ac.uk>
 +- experiment with patch format by adding various xen bugfixes
 +
  * Tue Nov 09 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.1.rc1.git7
  - Linux 2.6.37-rc1-git7