Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop
authorlhh <lhh@rock-chips.com>
Tue, 7 Dec 2010 02:24:49 +0000 (10:24 +0800)
committerlhh <lhh@rock-chips.com>
Tue, 7 Dec 2010 02:24:49 +0000 (10:24 +0800)
commit31a0a641efb5829250bf21b7abec5d2f66bbba45
treeeee852c0e976a089410e6d3bdc2e1c016419ac6e
parent1930cd5ea618603fee45e6dd1a35a701eb320319
parent94851da7243a5c4e3cc7283803211af4191bc156
Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop