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)
1  2 
drivers/mmc/card/block.c
fs/nfs/nfs4proc.c
fs/proc/base.c

Simple merge
Simple merge
diff --cc fs/proc/base.c
Simple merge