]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next-dlpar' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/power...
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Apr 2015 05:29:36 +0000 (15:29 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Apr 2015 05:30:21 +0000 (15:30 +1000)
Merge series from Nathan Fontenot to do memory hotplug in the kernel.

1  2 
arch/powerpc/include/asm/rtas.h
arch/powerpc/platforms/pseries/pseries.h

Simple merge