From: Bjorn Helgaas Date: Mon, 26 Nov 2012 20:00:57 +0000 (-0700) Subject: Merge branch 'for-linus' into next X-Git-Tag: MMI-PSA29.97-13-9~15390^2~8 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d3fe3988fb24e5ed13b2243b789a652882d3b26c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'for-linus' into next * for-linus: PCI/portdrv: Don't create hotplug slots unless port supports hotplug PCI/PM: Fix proc config reg access for D3cold and bridge suspending PCI/PM: Resume device before shutdown PCI/PM: Fix deadlock when unbinding device if parent in D3cold --- d3fe3988fb24e5ed13b2243b789a652882d3b26c