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)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: fix rpadlpar pci hotplug driver sysfs usage


Trivial merge