diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-28 03:17:32 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-28 03:17:32 +0200 |
| commit | 10420921675582903ab256dc3094206ac0280f68 (patch) | |
| tree | b774e849efa85255b2fbc0a24698c75196038e96 /drivers/memstick | |
| parent | powerpc/powernv: Return secondary CPUs to firmware on kexec (diff) | |
| parent | powerpc/hvsi: Increase handshake timeout from 200ms to 400ms. (diff) | |
| download | linux-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/memstick')
0 files changed, 0 insertions, 0 deletions