Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlzg <lzg@rockchip.com.cn>
Wed, 18 May 2011 13:54:07 +0000 (06:54 -0700)
committerlzg <lzg@rockchip.com.cn>
Wed, 18 May 2011 13:54:07 +0000 (06:54 -0700)
commitd0aec26f4a4ad6be88c5c6fd77c6382fe74f1802
treeb36cf85361ecb333d5281609af9cd24fb4760c6b
parent7bc64f33f45260a5813aaf9b48b5bcef6594ca6b
parent0e199a301f50dbb992e19fc0619c8d2d0a012d23
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop