tree 31ac3fddb0b14a202e9ceaa9681c1335ba35210c
parent 859281ff370977f917ec2195f86a5bfccf1fc6d6
parent 71a082efc9fdc12068a3cee6cebb1330b00ebeee
author Linus Torvalds <torvalds@linux-foundation.org> 1233631738 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1233631738 -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: Change link order of pciehp & acpiphp
  PCI hotplug: fakephp: Allocate PCI resources before adding the device
  PCI MSI: Fix undefined shift by 32
  PCI PM: Do not wait for buses in B2 or B3 during resume
  PCI PM: Power up devices before restoring their state
  PCI PM: Fix hibernation breakage on EeePC 701
  PCI: irq and pci_ids patch for Intel Tigerpoint DeviceIDs
  PCI PM: Fix suspend error paths and testing facility breakage