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

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

Tue, 10 Dec 2013 04:14:30 +0000 (12:14 +0800)

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

Tue, 10 Dec 2013 04:14:30 +0000 (12:14 +0800)
author 黄涛 <huangtao@rock-chips.com>
Tue, 10 Dec 2013 04:14:30 +0000 (12:14 +0800)
committer 黄涛 <huangtao@rock-chips.com>
Tue, 10 Dec 2013 04:14:30 +0000 (12:14 +0800)
diff --cc Makefile
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
author	黄涛 <huangtao@rock-chips.com>
	Tue, 10 Dec 2013 04:14:30 +0000 (12:14 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Tue, 10 Dec 2013 04:14:30 +0000 (12:14 +0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history