Merge branch 'develop' of xjh@10.10.10.29:/home/rockchip/kernel into develop
authorroot <root@ubuntu.(none)>
Sat, 18 Dec 2010 01:34:56 +0000 (09:34 +0800)
committerroot <root@ubuntu.(none)>
Sat, 18 Dec 2010 01:34:56 +0000 (09:34 +0800)
1  2 
arch/arm/mach-rk29/board-rk29sdk.c

Simple merge