Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into hwg
authorCMY <cmy@rock-chips.com>
Fri, 30 Mar 2012 02:11:48 +0000 (10:11 +0800)
committerCMY <cmy@rock-chips.com>
Fri, 30 Mar 2012 02:11:48 +0000 (10:11 +0800)
1  2 
arch/arm/mach-rk30/board-rk30-sdk.c

Simple merge