Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorzhaoyifeng <zyf@ubuntu-fs.(none)>
Sat, 12 Feb 2011 08:14:26 +0000 (16:14 +0800)
committerzhaoyifeng <zyf@ubuntu-fs.(none)>
Sat, 12 Feb 2011 08:14:26 +0000 (16:14 +0800)
commitad19fa8c7d5c49851407a33dcd761238b79351dc
treef58657743e17141e2ab6e744bc0c4b05d15d5f3a
parent99c1b8ea7384830b7f9240bdcb56eaf453275f6d
parentf1d6966364f28d0791b3d5a342c7fddb10446305
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop