Merge branch 'develop' of zyf@10.10.10.29:/home/rockchip/kernel into develop
authorzhaoyifeng <zyf@ubuntu-fs.(none)>
Sat, 18 Dec 2010 00:33:08 +0000 (08:33 +0800)
committerzhaoyifeng <zyf@ubuntu-fs.(none)>
Sat, 18 Dec 2010 00:33:08 +0000 (08:33 +0800)
commitf491f9a1626041fdfb6df5c9d2c2bb502d48f618
treef1160a5597ef1e17305b9ffad2b8ceb477a79a94
parent666258cbd741c36dd2ad7c00d54ab0e62a038f1f
parent510bccc31b572e2f8360f77d7b30b749adb60d87
Merge branch 'develop' of zyf@10.10.10.29:/home/rockchip/kernel into develop