summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 2c0d62d7..c90b027a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -611,6 +611,8 @@ Patch204: linux-2.6-debug-always-inline-kzalloc.patch
Patch210: debug-tty-print-dev-name.patch
+Patch300: pnp-log-pnp-resources-as-we-do-for-pci.patch
+
Patch380: linux-2.6-defaults-pci_no_msi.patch
Patch381: linux-2.6-defaults-pci_use_crs.patch
Patch383: linux-2.6-defaults-aspm.patch
@@ -1238,6 +1240,9 @@ ApplyPatch linux-2.6-defaults-pci_use_crs.patch
# enable ASPM by default on hardware we expect to work
ApplyPatch linux-2.6-defaults-aspm.patch
+# helps debug resource conflicts [c1f3f281]
+ApplyPatch pnp-log-pnp-resources-as-we-do-for-pci.patch
+
ApplyPatch ima-allow-it-to-be-completely-disabled-and-default-off.patch
#
@@ -2018,6 +2023,10 @@ fi
# || ||
%changelog
+* Mon Nov 29 2010 Kyle McMartin <kyle@redhat.com>
+- PNP: log PNP resources, as we do for PCI [c1f3f281]
+ should help us debug resource conflicts (requested by bjorn.)
+
* Mon Nov 29 2010 Kyle McMartin <kyle@redhat.com> 2.6.36.1-10
- tpm-autodetect-itpm-devices.patch: Auto-fix TPM issues on various
laptops which prevented suspend/resume. (#647132)