[kernel/rawhide/user/myoung/xendom0: 3/4] Merge branch 'master' into rawhide/user/myoung/xendom0

[myoung]

commit 14fd9886f284c45d8760457f1bc2f37054adda58
Merge: 2ce28c3 973a30d
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Wed Jan 5 18:45:40 2011 +0000

    Merge branch 'master' into rawhide/user/myoung/xendom0
    
    Conflicts:
    	kernel.spec

 .gitignore                                         |    1 -
 ...-battery-information-on-notification-0x81.patch |   38 +++++++------------
 kernel.spec                                        |   15 ++++++--
 sources                                            |    3 +-
 4 files changed, 26 insertions(+), 31 deletions(-)
---
diff --cc kernel.spec
index ca65934,a0ac5d9..cf6b15e
--- a/kernel.spec
+++ b/kernel.spec
@@@ -1968,9 -1951,13 +1968,16 @@@ f
  #                 ||     ||
  
  %changelog
+ * Tue Jan 04 2011 Kyle McMartin <kyle at redhat.com> 2.6.37-1
+ - Track release of 2.6.37
+ 
+ * Mon Jan 03 2011 Kyle McMartin <kyle at redhat.com> 2.6.37-0.rc8.git3.1
+ - Linux 2.6.37-rc8-git3
+ - Merged acpi battery notification patch and -rc8.
+ 
 +* Tue Jan 01 2011 Michael Young <m.a.young at durham.ac.uk>
 +- update pvops to add some xenbus patches
 +
  * Thu Dec 23 2010 Kyle McMartin <kyle at redhat.com>
  - Pull in flexcop procfs rename patch since it's still not upstream. (#664852)