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)
commit692dc89b93e7a0118e95cb95ede7f7e0990043b0
tree925ad5b1f90f668fb71a5838a3c74382db82b068
parent4956efed513a350d68a281e25111f5c071247359
parent9ea010582cb6019160db81cadc467720bd6ab116
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
arch/arm/mach-rk29/board-rk29-fih.c