tree 9263e28b67093eca6edd221f04830e5841f67c57
parent 5c402355adf8f920531f02099f4ec0d2bccd4c64
parent f17a077e61b627e58db5926bc474cf308318dad9
author Linus Torvalds <torvalds@linux-foundation.org> 1216933033 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216933033 -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: 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