]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Dec 2010 19:23:50 +0000 (11:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Dec 2010 19:23:50 +0000 (11:23 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c


Trivial merge