Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorcwz <cwz@rockchips.com>
Fri, 8 Apr 2011 07:26:03 +0000 (00:26 -0700)
committercwz <cwz@rockchips.com>
Fri, 8 Apr 2011 07:26:03 +0000 (00:26 -0700)
1  2 
arch/arm/mach-rk29/board-rk29-fih.c

Simple merge