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

[myoung]

commit 9dced2eb0aa940c57300ab0e26fca08afc364ceb
Merge: 75dfde8 f8e3fe8
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Thu Oct 21 19:02:44 2010 +0100

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

 add-support-for-ricoh-e822-sdhci.patch |  141 ++++++++++++++++++++++
 kernel.spec                            |   21 ++++
 r8169-fix-dma-allocations.patch        |  199 ++++++++++++++++++++++++++++++++
 skge-quirk-to-4gb-dma.patch            |   70 +++++++++++
 4 files changed, 431 insertions(+), 0 deletions(-)
---
diff --cc kernel.spec
index 5910a2b,94f99a1..4025f32
--- a/kernel.spec
+++ b/kernel.spec
@@@ -840,11 -838,17 +840,19 @@@ Patch14210: execve-improve-interactivit
  Patch14211: execve-make-responsive-to-sigkill-with-large-arguments.patch
  Patch14212: setup_arg_pages-diagnose-excessive-argument-size.patch
  
 -Patch14220: xen-fix-typo-in-xen-irq-fix.patch
 -
+ # rhbz#447489
+ Patch14224: skge-quirk-to-4gb-dma.patch
+ 
+ # rhbz#629158
+ Patch14225: r8169-fix-dma-allocations.patch
+ 
+ # rhbz#596475
+ Patch14226: add-support-for-ricoh-e822-sdhci.patch
  
 +Patch19997: xen.pvops.pre.patch
 +Patch19998: xen.pvops.patch
 +Patch19999: xen.pvops.post.patch
 +
  # ==============================================================================
  %endif
  
@@@ -1549,11 -1553,18 +1557,19 @@@ ApplyPatch execve-improve-interactivity
  ApplyPatch execve-make-responsive-to-sigkill-with-large-arguments.patch
  ApplyPatch setup_arg_pages-diagnose-excessive-argument-size.patch
  
 -# Fix typo in Xen patch from 2.6.22 that causes hang on boot.
 -ApplyPatch xen-fix-typo-in-xen-irq-fix.patch
 -
+ # rhbz#629158
+ ApplyPatch r8169-fix-dma-allocations.patch
+ 
+ # rhbz#447489
+ ApplyPatch skge-quirk-to-4gb-dma.patch
+ 
+ # rhbz#596475
+ ApplyPatch add-support-for-ricoh-e822-sdhci.patch
  
 +ApplyPatch xen.pvops.pre.patch
 +ApplyPatch xen.pvops.patch
 +ApplyPatch xen.pvops.post.patch
 +
  # END OF PATCH APPLICATIONS ====================================================
  %endif
  
@@@ -2206,11 -2217,11 +2222,16 @@@ f
  %kernel_variant_files -k vmlinux %{with_kdump} kdump
  
  %changelog
+ * Thu Oct 14 2010 Kyle McMartin <kyle at redhat.com>
+ - rhbz447489: skge-quirk-to-4gb-dma.patch
+ - rhbz629158: r8169-fix-dma-allocations.patch
+ - rhbz596475: add-support-for-ricoh-e822-sdhci.patch
+ 
 +* Wed Oct 06 2010 Michael Young <m.a.young at durham.ac.uk>
 +- update pvops including memory and irq fixes
 +- Drop xen-fix-typo-in-xen-irq-fix.patch as it is in the pvops patch
 +- Build new xen watchdog driver CONFIG_XEN_WDT=m
 +
  * Mon Sep 27 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.32.23-170
  - Linux 2.6.32.23
  - Drop merged patches: