Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Sat, 25 Jun 2011 14:42:44 +0000 (22:42 +0800)
committer蔡枫 <cf@rock-chips.com>
Sat, 25 Jun 2011 14:42:44 +0000 (22:42 +0800)
commit7dc75821713544c3d7ca7edbfe30b540114169ce
tree8089a10c124ec80c5f6c74ad48f115a1e1aae56a
parent184fcf661515771bc5fc9e4209ee46693195e0d5
parent753db746ee08eee44b99aeafc958dea5de1a80c5
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop