Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author张文平 <zwp@rk29.(none)>
Thu, 22 Sep 2011 04:50:12 +0000 (12:50 +0800)
committer张文平 <zwp@rk29.(none)>
Thu, 22 Sep 2011 04:50:12 +0000 (12:50 +0800)
commit830b7eb306946b1a2f266b706e2f76b20a08b86d
tree5d550aaeb82745eee56f99927c83435f8d5a4e02
parent5d6771f4c2262c17a7670b06a27e5ee1dbbcfa73
parent1ec81553a0858a8136eae6185f70fb05cb3352bd
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop