From: Linus Torvalds Date: Fri, 19 Dec 2008 19:33:10 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... X-Git-Tag: v2.6.28~23 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eae34c67940f2a71837ed30d571b93572186d46b;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 hotplug: ibmphp: Fix module ref count underflow PCI hotplug: acpiphp wants a 64-bit _SUN PCI: pciehp: fix unexpected power off with pciehp_force PCI: fix aer resume sanity check --- eae34c67940f2a71837ed30d571b93572186d46b