Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop
authorlhh <lhh@rock-chips.com>
Thu, 23 Dec 2010 07:23:12 +0000 (15:23 +0800)
committerlhh <lhh@rock-chips.com>
Thu, 23 Dec 2010 07:23:12 +0000 (15:23 +0800)
commit9848bcb15d1495a8945bc3526711749908d4e334
tree18b15f264a7248eb271189faab1588e3fc28952c
parenta91ea896443c408ca9d7b04fe69a8f07e8601876
parent48514c0ee3066467023f5c9ddc703e6d4454ddd0
Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop