diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2010-12-01 10:27:16 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2010-12-01 10:27:16 -0500 |
| commit | f1aeb30fcc5c14d35073a5135c5e02a6405f626d (patch) | |
| tree | 8247789c09954a3767bb2f979e2f6c8677ff0a15 /kernel.spec | |
| parent | 5256969a144384bbc86281c7e50fde4130345b43 (diff) | |
| download | kernel-f1aeb30fcc5c14d35073a5135c5e02a6405f626d.tar.gz kernel-f1aeb30fcc5c14d35073a5135c5e02a6405f626d.tar.xz kernel-f1aeb30fcc5c14d35073a5135c5e02a6405f626d.zip | |
add on drm-fixes until they're queued
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 170313ff5..67b66b60e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -648,6 +648,7 @@ Patch1555: fix_xen_guest_on_old_EC2.patch # DRM # nouveau + drm fixes +Patch1801: drm-fixes.patch Patch1810: drm-nouveau-updates.patch Patch1819: drm-intel-big-hammer.patch # intel drm is all merged upstream @@ -1242,6 +1243,7 @@ ApplyPatch linux-2.6-e1000-ich9-montevina.patch ApplyPatch fix_xen_guest_on_old_EC2.patch # DRM core +ApplyPatch drm-fixes.patch # Nouveau DRM ApplyOptionalPatch drm-nouveau-updates.patch @@ -1912,6 +1914,7 @@ fi %changelog * Wed Dec 01 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.rc4.git1.1 - Linux 2.6.37-rc4-git1 +- Pull in DRM fixes that are queued for -rc5 [3074adc8] * Tue Nov 30 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.rc4.git0.1 - Linux 2.6.37-rc4 |