Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb

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

Tue, 31 Jul 2012 02:15:18 +0000 (10:15 +0800)

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

Tue, 31 Jul 2012 02:15:18 +0000 (10:15 +0800)
author 黄涛 <huangtao@rock-chips.com>
Tue, 31 Jul 2012 02:15:18 +0000 (10:15 +0800)
committer 黄涛 <huangtao@rock-chips.com>
Tue, 31 Jul 2012 02:15:18 +0000 (10:15 +0800)
diff --cc arch/arm/configs/rk30_ds1001b_defconfig
Simple merge
diff --cc drivers/gpio/Kconfig
Simple merge
author	黄涛 <huangtao@rock-chips.com>
	Tue, 31 Jul 2012 02:15:18 +0000 (10:15 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Tue, 31 Jul 2012 02:15:18 +0000 (10:15 +0800)
		1	2
arch/arm/configs/rk30_ds1001b_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history