Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jul 2008 20:57:13 +0000 (13:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jul 2008 20:57:13 +0000 (13:57 -0700)
commit5042d99795d3d817bef2f4cc46e953bee9bf7398
tree9263e28b67093eca6edd221f04830e5841f67c57
parent5c402355adf8f920531f02099f4ec0d2bccd4c64
parentf17a077e61b627e58db5926bc474cf308318dad9
Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: fixup sparse endianness warnings in proc.c
  PCI PM: make more PCI PM core functionality available to drivers
  PCI/DMAR: don't assume presence of RMRRs
  PCI hotplug: fix error path in pci_slot's register_slot