From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 May 2008 17:18:02 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: v2.6.26-rc5~31
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f8356ed00ebcdc2f209504c02b4ab8ba9a8a7ebe;p=linux-2.6-omap-h63xx.git

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: fix rpadlpar pci hotplug driver sysfs usage
---

f8356ed00ebcdc2f209504c02b4ab8ba9a8a7ebe