summaryrefslogtreecommitdiffstats
path: root/drivers/extcon
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-08-28 03:17:32 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-08-28 03:17:32 +0200
commit10420921675582903ab256dc3094206ac0280f68 (patch)
treeb774e849efa85255b2fbc0a24698c75196038e96 /drivers/extcon
parentpowerpc/powernv: Return secondary CPUs to firmware on kexec (diff)
parentpowerpc/hvsi: Increase handshake timeout from 200ms to 400ms. (diff)
downloadlinux-10420921675582903ab256dc3094206ac0280f68.tar.xz
linux-10420921675582903ab256dc3094206ac0280f68.zip
Merge branch 'merge' into next
Merge recent fixes to lparcfg so subsequent patches can move the whole file to arch/powerpc/platforms/pseries
Diffstat (limited to 'drivers/extcon')
0 files changed, 0 insertions, 0 deletions