Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoryangkai <yangkai@ubuntu-fs>
Thu, 17 Feb 2011 08:57:37 +0000 (16:57 +0800)
committeryangkai <yangkai@ubuntu-fs>
Thu, 17 Feb 2011 08:57:37 +0000 (16:57 +0800)
commit3ef4cc6362457c337480c6e38dab4febf0e523bd
treea0a1986ce8ad4b9dc4189c43afb3618f58c7aaad
parent89cc53802044e2932edaaac0bf75ffb17f81a4ea
parentd4a0d116b123a0b88b790b39694bb5c352c67d7f
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop