Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into...

author 黄涛 <huangtao@rock-chips.com>

Mon, 16 Dec 2013 06:23:41 +0000 (14:23 +0800)

committer 黄涛 <huangtao@rock-chips.com>

Mon, 16 Dec 2013 06:23:41 +0000 (14:23 +0800)
author 黄涛 <huangtao@rock-chips.com>
Mon, 16 Dec 2013 06:23:41 +0000 (14:23 +0800)
committer 黄涛 <huangtao@rock-chips.com>
Mon, 16 Dec 2013 06:23:41 +0000 (14:23 +0800)
diff --cc Makefile
Simple merge
diff --cc drivers/video/Kconfig
Simple merge
author	黄涛 <huangtao@rock-chips.com>
	Mon, 16 Dec 2013 06:23:41 +0000 (14:23 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Mon, 16 Dec 2013 06:23:41 +0000 (14:23 +0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history