Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
commiteae34c67940f2a71837ed30d571b93572186d46b
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Dec 2008 19:33:10 +0000 (19 11:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Dec 2008 19:33:10 +0000 (19 11:33 -0800)
tree8bfb4a473601e8d87eadd8bf4f66cf3122be35c7
parent929096fe9ff1f4b3645cf3919527ab47e8d5e17c
parent3e3d0e9246d0eccc1da800348fc1b9199ae3d768
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 hotplug: ibmphp: Fix module ref count underflow
  PCI hotplug: acpiphp wants a 64-bit _SUN
  PCI: pciehp: fix unexpected power off with pciehp_force
  PCI: fix aer resume sanity check