tree 61fc69b6e2a82947550d6c441b62986c816ad911
parent 7954d5cf39ee1ce9bb0a4b19fcf1924885a9cad1
parent c2fdd36b550659f5ac2240d1f5a83ffa1a092289
author Linus Torvalds <torvalds@linux-foundation.org> 1232993616 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1232993616 -0800

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 hotplug: fix lock imbalance in pciehp
  PCI PM: Restore standard config registers of all devices early
  PCI/MSI: bugfix/utilize for msi_capability_init()