Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorcwz <cwz@rockchips.com>
Fri, 22 Apr 2011 02:45:57 +0000 (19:45 -0700)
committercwz <cwz@rockchips.com>
Fri, 22 Apr 2011 02:45:57 +0000 (19:45 -0700)
commit3b25048ffc3fbfe3e0e7e7f857f7e3cc77e14d41
treebee618430f4629742dfd9785575c8e97a9d0bbad
parent9c84196d474f0cb86e33c946df81dbc0cb67aa08
parent89db2521c502b3a812ca8b89f5d3874fd4b9b3eb
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop