Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorfang <fang@fang-desktop.(none)>
Tue, 7 Dec 2010 11:14:04 +0000 (19:14 +0800)
committerfang <fang@fang-desktop.(none)>
Tue, 7 Dec 2010 11:14:04 +0000 (19:14 +0800)
commit460945a955aac8f078fd3113d08964887b15e826
treec40b3af5556f0187c16171fa13baf1bdfbc464cc
parent14ce6b3c85eb7c43ea65449192b942aed68122df
parent1540869e287a14574ba5fa9e5427a71d18424719
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop