Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop
authorlhh <lhh@rock-chips.com>
Fri, 10 Dec 2010 06:24:03 +0000 (14:24 +0800)
committerlhh <lhh@rock-chips.com>
Fri, 10 Dec 2010 06:24:03 +0000 (14:24 +0800)
commit5b3c73f1be8ea83352f7ea73c98444a95592317e
treefd60032d7e4ba5cc27e4a28c21a7af218bac8380
parent6033f1e646eadb7a4f5991e2c2395d4d975c8d82
parentb542fe7dcb3770ed98ce716cd85da143633bdd7a
Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop