Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlhh <lhh@rock-chips.com>
Thu, 27 Jan 2011 09:07:17 +0000 (17:07 +0800)
committerlhh <lhh@rock-chips.com>
Thu, 27 Jan 2011 09:07:17 +0000 (17:07 +0800)
commitf881b6a014d1badc37eee1ed87be53c0c6fa6ab5
treef3e9d7e1ed697b50b6fff6509f6f0a467cfd6bef
parent0a70ec0d75c1db05002ef64fd00a9a4339eab3b6
parent31f284d67cef70eeb8b6bf1c0d489f5b34206d86
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop