Merge remote-tracking branch 'remotes/origin/develop-3.0' into develop-3.0-rk2928
author黄涛 <huangtao@rock-chips.com>
Tue, 10 Jul 2012 05:11:01 +0000 (13:11 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 10 Jul 2012 05:11:01 +0000 (13:11 +0800)
commit3e3fca27c663e3f14f693638877bd94e5d278782
tree296eec9a411ebcb24f60f7351e7fb515321da59f
parent897f46a57c24bded11d148fb5e694a6cee566371
parent0b821e09a8341fc894725f9d96b187e9ed07d7df
Merge remote-tracking branch 'remotes/origin/develop-3.0' into develop-3.0-rk2928

Conflicts:
arch/arm/plat-rk/Makefile
arch/arm/Kconfig