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)
commit71ee502281c88db9562586404202d216c3c27bf9
treea95a03f495cab962c25e16bf5a0469c1226c262e
parentb3d408cc6dbfa6da2e7a6ddd2fd4cfd94e621069
parent645bb8cb3fe2cf56bf93d794f24c697bd1b5cc72
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
arch/arm/configs/rk30_ds1001b_defconfig
drivers/gpio/Kconfig