diff --git a/kernel.spec b/kernel.spec
index 2c0d62d71..c90b027a7 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)
diff --git a/pnp-log-pnp-resources-as-we-do-for-pci.patch b/pnp-log-pnp-resources-as-we-do-for-pci.patch
new file mode 100644
index 000000000..e3b8a2e77
--- /dev/null
+++ b/pnp-log-pnp-resources-as-we-do-for-pci.patch
@@ -0,0 +1,84 @@
+From 2d28c74b75ef2900e7016eef29a5ab9a4174b1f0 Mon Sep 17 00:00:00 2001
+From: Bjorn Helgaas <bjorn.helgaas@hp.com>
+Date: Wed, 29 Sep 2010 12:24:23 -0600
+Subject: PNP: log PNP resources, as we do for PCI
+
+ACPI devices are often involved in address space conflicts with PCI devices,
+so I think it's worth logging the resources they use.  Otherwise we have to
+depend on lspnp or groping around in sysfs to find them.
+
+Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
+Signed-off-by: Len Brown <len.brown@intel.com>
+---
+ drivers/pnp/core.c     |    5 +++--
+ drivers/pnp/resource.c |   10 +++++-----
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
+index 88b3cde..53a8f33 100644
+--- a/drivers/pnp/core.c
++++ b/drivers/pnp/core.c
+@@ -194,8 +194,9 @@ int pnp_add_device(struct pnp_dev *dev)
+ 	for (id = dev->id; id; id = id->next)
+ 		len += scnprintf(buf + len, sizeof(buf) - len, " %s", id->id);
+ 
+-	pnp_dbg(&dev->dev, "%s device, IDs%s (%s)\n",
+-		dev->protocol->name, buf, dev->active ? "active" : "disabled");
++	dev_printk(KERN_DEBUG, &dev->dev, "%s device, IDs%s (%s)\n",
++		   dev->protocol->name, buf,
++		   dev->active ? "active" : "disabled");
+ 	return 0;
+ }
+ 
+diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
+index e3446ab..a925e6b 100644
+--- a/drivers/pnp/resource.c
++++ b/drivers/pnp/resource.c
+@@ -523,7 +523,7 @@ struct pnp_resource *pnp_add_irq_resource(struct pnp_dev *dev, int irq,
+ 	res->start = irq;
+ 	res->end = irq;
+ 
+-	pnp_dbg(&dev->dev, "  add %pr\n", res);
++	dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
+ 	return pnp_res;
+ }
+ 
+@@ -544,7 +544,7 @@ struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma,
+ 	res->start = dma;
+ 	res->end = dma;
+ 
+-	pnp_dbg(&dev->dev, "  add %pr\n", res);
++	dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
+ 	return pnp_res;
+ }
+ 
+@@ -568,7 +568,7 @@ struct pnp_resource *pnp_add_io_resource(struct pnp_dev *dev,
+ 	res->start = start;
+ 	res->end = end;
+ 
+-	pnp_dbg(&dev->dev, "  add %pr\n", res);
++	dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
+ 	return pnp_res;
+ }
+ 
+@@ -592,7 +592,7 @@ struct pnp_resource *pnp_add_mem_resource(struct pnp_dev *dev,
+ 	res->start = start;
+ 	res->end = end;
+ 
+-	pnp_dbg(&dev->dev, "  add %pr\n", res);
++	dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
+ 	return pnp_res;
+ }
+ 
+@@ -616,7 +616,7 @@ struct pnp_resource *pnp_add_bus_resource(struct pnp_dev *dev,
+ 	res->start = start;
+ 	res->end = end;
+ 
+-	pnp_dbg(&dev->dev, "  add %pr\n", res);
++	dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
+ 	return pnp_res;
+ }
+ 
+-- 
+1.7.3.2
+