Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 May 2009 19:17:03 +0000 (12:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 May 2009 19:17:03 +0000 (12:17 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI Hotplug: acpiphp: don't store a pci_dev in acpiphp_func


Trivial merge