Merge remote branch 'origin/develop_xbw_update-SDCard' into develop
author杨云 <yangyun@rock-chips.com>
Tue, 19 Jul 2011 01:02:40 +0000 (09:02 +0800)
committer杨云 <yangyun@rock-chips.com>
Tue, 19 Jul 2011 01:02:40 +0000 (09:02 +0800)
1  2 
arch/arm/mach-rk29/board-rk29sdk.c

Simple merge