tree 23d9443331673a75e296781031f652e3e87687cc
parent c19e80808b34b3de5c20884f11f58c3b6988daff
parent 395a125c6237802b19bf22b41017c99ff57f1024
author Linus Torvalds <torvalds@linux-foundation.org> 1221342453 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1221342453 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: re-add debug prints for unmodified BARs
  PCI: fix pciehp_free_irq()
  PCI Hotplug: fakephp: fix deadlock... again
  PCI: Fix printk warnings in setup-bus.c
  PCI: Fix printk warnings in probe.c
  PCI/iommu: blacklist DMAR on Intel G31/G33 chipsets