Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

author Mark Brown <broonie@kernel.org>

Mon, 2 Feb 2015 11:29:26 +0000 (11:29 +0000)

committer Mark Brown <broonie@kernel.org>

Mon, 2 Feb 2015 11:29:26 +0000 (11:29 +0000)
author Mark Brown <broonie@kernel.org>
Mon, 2 Feb 2015 11:29:26 +0000 (11:29 +0000)
committer Mark Brown <broonie@kernel.org>
Mon, 2 Feb 2015 11:29:26 +0000 (11:29 +0000)
diff --cc drivers/gpio/gpiolib.c
Simple merge
diff --cc fs/ext4/ext4.h
Simple merge
diff --cc fs/ext4/mballoc.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 2 Feb 2015 11:29:26 +0000 (11:29 +0000)
committer	Mark Brown <broonie@kernel.org>
	Mon, 2 Feb 2015 11:29:26 +0000 (11:29 +0000)
		1	2
drivers/gpio/gpiolib.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ext4/ext4.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ext4/mballoc.c	patch \|	diff1 \|	diff2 \|	blob \| history