Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Fri, 21 Nov 2014 18:53:31 +0000 (18:53 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 21 Nov 2014 18:53:31 +0000 (18:53 +0000)
commit5d0676ad297dc9ac5f8a39070ddfb2245d3c7301
tree1408641cbf2d707f95ee429833395f55438d93b0
parentcdadf750b6f249215d251c1a5918c473132c7421
parent09cc926e9a6002790e69ed213217ef9874888624
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
arch/arm/mm/fault.c
fs/nfs/inode.c
fs/nfs/nfs4proc.c
include/linux/mm.h
include/linux/sched.h
mm/memcontrol.c