Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Thu, 8 Jan 2015 18:54:26 +0000 (18:54 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 8 Jan 2015 18:54:26 +0000 (18:54 +0000)
commitbccb225417c38461916eced0d24cfdfcdfb03f86
treeb05526a9eb778e34c39c74fe2393d967af2b3336
parent45fb4fc7edf6ae0b757491058f337c006823dae3
parentbbba26b2fc88c77239ebcd45d7fb669018511dfe
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/mmc/card/block.c
fs/nfs/nfs4proc.c
fs/proc/base.c