Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Mon, 2 Dec 2013 11:07:39 +0000 (11:07 +0000)
committerMark Brown <broonie@linaro.org>
Mon, 2 Dec 2013 11:07:39 +0000 (11:07 +0000)
commitcc1aba63160a29830b9184204e4b2fb96ba47a08
tree3bfc9df8f2fd1c6d738026888e2e4dbc2d1e81e9
parent8c227d3b86c422e71dae2c2022b29c777f814357
parent4421cbec4387a2003646b061bf2210b268997444
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
arch/x86/kernel/process.c
fs/nfs/nfs4proc.c
include/linux/sched.h