Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 May 2008 17:18:02 +0000 (10:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 May 2008 17:18:02 +0000 (10:18 -0700)
commitf8356ed00ebcdc2f209504c02b4ab8ba9a8a7ebe
tree9191d024e747919eb05b83662b7f40f77d76dbe7
parent7536d7be7b718f8c5834cbcb7601816562e1b805
parenta9b841e1a336822a25899ec8cdf70a55a6696ae7
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: fix rpadlpar pci hotplug driver sysfs usage