diff options
| author | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-10-15 15:05:17 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-10-15 15:05:17 -0400 |
| commit | 694abf90a32e10df39c0953ef32f6ff73510e4d9 (patch) | |
| tree | 0b92a0a979c792d8b493c4bc509fb95e2859ccd3 /kernel.spec | |
| parent | 42dee18802debfa8cad4e94c9e904e8b0b183833 (diff) | |
| download | kernel-694abf90a32e10df39c0953ef32f6ff73510e4d9.tar.gz kernel-694abf90a32e10df39c0953ef32f6ff73510e4d9.tar.xz kernel-694abf90a32e10df39c0953ef32f6ff73510e4d9.zip | |
backport pnpacpi-cope-with-invalid-device-ids from linux-next
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index b4294397d..c9dc2d173 100644 --- a/kernel.spec +++ b/kernel.spec @@ -724,6 +724,8 @@ Patch12224: pci-v2-4-4-PCI-allocate-bus-resources-from-the-top-down.patch Patch12300: btusb-macbookpro-7-1.patch Patch12301: btusb-macbookpro-6-2.patch +Patch12302: pnpacpi-cope-with-invalid-device-ids.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1333,6 +1335,9 @@ ApplyPatch pci-v2-4-4-PCI-allocate-bus-resources-from-the-top-down.patch ApplyPatch btusb-macbookpro-7-1.patch ApplyPatch btusb-macbookpro-6-2.patch +# rhbz#641468 +ApplyPatch pnpacpi-cope-with-invalid-device-ids.patch + # END OF PATCH APPLICATIONS %endif @@ -1940,6 +1945,10 @@ fi # || || %changelog +* Fri Oct 15 2010 Kyle McMartin <kyle@redhat.com> +- backport pnpacpi-cope-with-invalid-device-ids from linux-next. + (rhbz#641468) + * Fri Oct 15 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.39.rc8.git0 - Linux 2.6.36-rc8. |