From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Dec 2010 19:23:50 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Url: https://git.karo-electronics.de/?p=mv-sheeva.git;a=commitdiff_plain;h=b52e2a6d6d05421dea6b6a94582126af8cd5cca2

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 hotplug: Fix unexpected driver unregister in pciehp_acpi.c
---

b52e2a6d6d05421dea6b6a94582126af8cd5cca2