Merge remote-tracking branch 'arm-landing/lsk-3.10-gator' into linux-linaro-lsk-andro...

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

Tue, 15 Oct 2013 02:35:02 +0000 (10:35 +0800)

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

Tue, 15 Oct 2013 02:35:02 +0000 (10:35 +0800)
author Alex Shi <alex.shi@linaro.org>
Tue, 15 Oct 2013 02:35:02 +0000 (10:35 +0800)
committer Alex Shi <alex.shi@linaro.org>
Tue, 15 Oct 2013 02:35:02 +0000 (10:35 +0800)
diff --cc drivers/Kconfig
Simple merge
diff --cc drivers/Makefile
Simple merge
author	Alex Shi <alex.shi@linaro.org>
	Tue, 15 Oct 2013 02:35:02 +0000 (10:35 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Tue, 15 Oct 2013 02:35:02 +0000 (10:35 +0800)
		1	2
drivers/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history