Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into hwg
authorCMY <cmy@rock-chips.com>
Thu, 29 Mar 2012 12:22:51 +0000 (20:22 +0800)
committerCMY <cmy@rock-chips.com>
Thu, 29 Mar 2012 12:22:51 +0000 (20:22 +0800)
1  2 
arch/arm/mach-rk30/board-rk30-sdk.c

Simple merge