Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorcwz <cwz@rockchips.com>
Wed, 3 Aug 2011 08:10:48 +0000 (01:10 -0700)
committercwz <cwz@rockchips.com>
Wed, 3 Aug 2011 08:10:48 +0000 (01:10 -0700)
commit6cfd80746f3dca2ea70c689aeda0c9e263d8e4ea
treec0a8e25caf855fbe186ebd3322aee6288197e4d5
parent243dcf38a58388d04dab1e41d5cf92f1fd4457b0
parent867974483c0808f162d6b6b5cf7488b063e67a07
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop