Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop
authorlhh <lhh@rock-chips.com>
Sat, 25 Dec 2010 07:57:59 +0000 (15:57 +0800)
committerlhh <lhh@rock-chips.com>
Sat, 25 Dec 2010 07:57:59 +0000 (15:57 +0800)
commitf5200142870e463d0eca4a2cb984dcf27556c7af
tree755835ad4ca0b234dab3b829cdbab10865a63332
parent38798d63e9e5ace2657b169c48d90e44532f33b1
parent6a2a6b046209b3de87773e73d75a6c665e40d792
Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop