From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Aug 2009 18:00:37 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9b8f013a8361b05edf511f04fe93b36310b73806;p=openwrt%2Fstaging%2Fblogic.git

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 hotplug: SGI hotplug: do not use hotplug_slot_attr
  PCI hotplug: SGI hotplug: fix build failure
---

9b8f013a8361b05edf511f04fe93b36310b73806