aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/ibmphp_hpc.c
diff options
context:
space:
mode:
authorIngo Molnar <[email protected]>2013-09-26 18:49:53 +0000
committerIngo Molnar <[email protected]>2013-09-26 18:49:53 +0000
commit474a83b76f6bde8a5f8f8e39d90181ca85d39f46 (patch)
treea9f8e2e790b74de50d85469ec79fb1c841c3da90 /drivers/pci/hotplug/ibmphp_hpc.c
parentreboot: Allow specifying warm/cold reset for CF9 boot type (diff)
parentMerge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
downloadkernel-474a83b76f6bde8a5f8f8e39d90181ca85d39f46.tar.gz
kernel-474a83b76f6bde8a5f8f8e39d90181ca85d39f46.zip
Merge branch 'linus'
Merge in the relevant upstream merge point to queue up dependent patch. Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/pci/hotplug/ibmphp_hpc.c')
0 files changed, 0 insertions, 0 deletions