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

[myoung]

commit 0bd53dc5644bb57bc6c03310fbcaf353a8d1c3c6
Merge: 83389cd 77886dd
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Wed Jan 26 20:20:10 2011 +0000

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

 config-x86-generic |    2 +-
 kernel.spec        |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc kernel.spec
index 737f41a,7a5192c..e45333b
--- a/kernel.spec
+++ b/kernel.spec
@@@ -1976,14 -1955,9 +1976,17 @@@ f
  #                 ||----w |
  #                 ||     ||
  %changelog
+ * Tue Jan 25 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc2.git3.2
+ - [x86] Disable TRANSPARENT_HUGEPAGE for now, there be dragons there.
+ 
 +* Tue Jan 25 2011 Michael Young <m.a.young at durham.ac.uk>
 +- Switch from xen/next-2.6.37 to xen/next-2.6.38
 +  which adds XEN_NETDEV_BACKEND and XEN_PCIDEV_BACKEND
 +- comment out xen.pcifront.fixes.patch (patches are in next-2.6.38)
 +- put 2.6.38-rc1-memory-fixes branch in xen.pvhvm.fixes.patch
 +  for some memory fixes including a later version of the crash on boot patch
 +- don't build non-PAE debug kernel for i686
 +
  * Tue Jan 25 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc2.git3.1
  - Linux 2.6.38-rc2-git3
  - perf-gcc460-build-fixes.patch: fix context from [9486aa38]