summaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/ibmphp_pci.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-09-26 20:49:53 +0200
committerIngo Molnar <mingo@kernel.org>2013-09-26 20:49:53 +0200
commit474a83b76f6bde8a5f8f8e39d90181ca85d39f46 (patch)
treea9f8e2e790b74de50d85469ec79fb1c841c3da90 /drivers/pci/hotplug/ibmphp_pci.c
parent16c21ae5ca636cfd38e581ebcf709c49d78ea56d (diff)
parent654fdd041227d7de1594baa61c58f2c87bd0640f (diff)
Merge branch 'linus'
Merge in the relevant upstream merge point to queue up dependent patch. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/pci/hotplug/ibmphp_pci.c')
0 files changed, 0 insertions, 0 deletions