Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

author Alex Shi <alex.shi@linaro.org>

Thu, 21 May 2015 02:02:28 +0000 (10:02 +0800)

committer Alex Shi <alex.shi@linaro.org>

Thu, 21 May 2015 02:02:28 +0000 (10:02 +0800)
author Alex Shi <alex.shi@linaro.org>
Thu, 21 May 2015 02:02:28 +0000 (10:02 +0800)
committer Alex Shi <alex.shi@linaro.org>
Thu, 21 May 2015 02:02:28 +0000 (10:02 +0800)
diff --cc arch/arm64/Kconfig
Simple merge
diff --cc arch/arm64/kernel/entry.S
Simple merge
diff --cc drivers/gpio/gpiolib.c
Simple merge
diff --cc drivers/mmc/card/block.c
Simple merge
author	Alex Shi <alex.shi@linaro.org>
	Thu, 21 May 2015 02:02:28 +0000 (10:02 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Thu, 21 May 2015 02:02:28 +0000 (10:02 +0800)
		1	2
arch/arm64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/entry.S	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	patch \|	diff1 \|	diff2 \|	blob \| history