[kernel/rawhide/user/myoung/xendom0: 12/13] Merge branch 'master' into rawhide/user/myoung/xendom0

[myoung]

commit 8ffcefc566c446e1a0f8ae25e29e2b3398d4d0c9
Merge: ddb95b3 3d2b80a
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Sat Feb 19 20:44:50 2011 +0000

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

 ...orruption-that-leads-to-memory-corruption.patch |   42 --------------------
 kernel.spec                                        |   18 +++------
 revert-block-check-bdev-readonly.patch             |   33 ---------------
 sources                                            |    1 +
 4 files changed, 7 insertions(+), 87 deletions(-)
---
diff --cc kernel.spec
index d49e958,b1256f9..7798303
--- a/kernel.spec
+++ b/kernel.spec
@@@ -742,21 -736,6 +742,16 @@@ Patch12438: ath5k-fix-fast-channel-chan
  # rhbz#676860
  Patch12441: usb-sierra-add-airprime-direct-ip.patch
  
- # rhbz#672265
- Patch12442: revert-block-check-bdev-readonly.patch
- 
 +# Xen patches
 +# git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git branches
 +#Patch20000: xen.next-2.6.38.patch
 +#Patch20001: xen.upstream.core.patch
 +# git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git branches
 +#Patch20005: xen.pcifront.fixes.patch
 +Patch20006: xen.pcifront.next-2.6.38.patch
 +# git://xenbits.xen.org/people/sstabellini/linux-pvhvm branches
 +#Patch20010: xen.pvhvm.fixes.patch
 +
  %endif
  
  BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@@ -1375,18 -1354,6 +1370,13 @@@ ApplyPatch ath5k-fix-fast-channel-chang
  # rhbz#676860
  ApplyPatch usb-sierra-add-airprime-direct-ip.patch
  
- # rhbz#672265
- ApplyPatch revert-block-check-bdev-readonly.patch
- 
 +# Xen patches
 +#ApplyPatch xen.next-2.6.38.patch
 +#ApplyPatch xen.upstream.core.patch
 +#ApplyPatch xen.pcifront.fixes.patch
 +ApplyPatch xen.pcifront.next-2.6.38.patch
 +#ApplyPatch xen.pvhvm.fixes.patch
 +
  # END OF PATCH APPLICATIONS
  
  %endif