Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 06:13:09 +0000 (14:13 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 06:13:09 +0000 (14:13 +0800)
commite3b5dc5d8b12ca4f5ccf5cffc6e5712be791b129
treebf7d929d166de5bdb569b0eca1a88e3d6e0d00ae
parent43b74bf7c6af4fe398e705243ba2d8d5fe3370d7
parentceafc84623c8ef94c13a87363277a595988b2b79
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
arch/arm/mm/mmu.c
arch/arm/mm/mmu.c
fs/pstore/ram.c
net/wireless/nl80211.c