Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Aug 2009 18:00:37 +0000 (11:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Aug 2009 18:00:37 +0000 (11:00 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI hotplug: SGI hotplug: do not use hotplug_slot_attr
  PCI hotplug: SGI hotplug: fix build failure


Trivial merge