]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'powerpc/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 7 Jan 2014 23:58:55 +0000 (10:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 7 Jan 2014 23:58:55 +0000 (10:58 +1100)
1  2 
arch/powerpc/kernel/asm-offsets.c
include/linux/mm.h
mm/mempolicy.c

Simple merge
Simple merge
diff --cc mm/mempolicy.c
Simple merge