Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Mon, 2 Feb 2015 11:29:26 +0000 (11:29 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 2 Feb 2015 11:29:26 +0000 (11:29 +0000)
commit43b74bf7c6af4fe398e705243ba2d8d5fe3370d7
treee55ad13d56dc6b9b281b1df561cd9f1617cbba44
parent72ca3a2d7a150ee50fb526dab6bd417dd211ffe9
parent692d96aa22dea8bb80018c6a76556ad6afd464a6
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/gpio/gpiolib.c
fs/ext4/ext4.h
fs/ext4/mballoc.c