diff options
| author | Michael Young <m.a.young@durham.ac.uk> | 2010-10-21 19:02:44 +0100 |
|---|---|---|
| committer | Michael Young <m.a.young@durham.ac.uk> | 2010-10-21 19:02:44 +0100 |
| commit | 9dced2eb0aa940c57300ab0e26fca08afc364ceb (patch) | |
| tree | 8206c464f4b81b6113dd0f2d580f4da216c3b58a /kernel.spec | |
| parent | 75dfde8b27d15fce8a8b319545a07d16b504f140 (diff) | |
| parent | f8e3fe8229d0f6fb0330694f5ec1621417c0dc62 (diff) | |
| download | dom0-kernel-9dced2eb0aa940c57300ab0e26fca08afc364ceb.tar.gz dom0-kernel-9dced2eb0aa940c57300ab0e26fca08afc364ceb.tar.xz dom0-kernel-9dced2eb0aa940c57300ab0e26fca08afc364ceb.zip | |
Merge branch 'f12/master' into f12/user/myoung/xendom0
Conflicts:
kernel.spec
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 5910a2b..4025f32 100644 --- a/kernel.spec +++ b/kernel.spec @@ -840,6 +840,14 @@ Patch14210: execve-improve-interactivity-with-large-arguments.patch Patch14211: execve-make-responsive-to-sigkill-with-large-arguments.patch Patch14212: setup_arg_pages-diagnose-excessive-argument-size.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 @@ -1549,6 +1557,14 @@ ApplyPatch execve-improve-interactivity-with-large-arguments.patch ApplyPatch execve-make-responsive-to-sigkill-with-large-arguments.patch ApplyPatch setup_arg_pages-diagnose-excessive-argument-size.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 @@ -2206,6 +2222,11 @@ fi %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Thu Oct 14 2010 Kyle McMartin <kyle@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@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 |