Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlzg <lzg@rockchip.com.cn>
Fri, 6 May 2011 07:27:53 +0000 (00:27 -0700)
committerlzg <lzg@rockchip.com.cn>
Fri, 6 May 2011 07:27:53 +0000 (00:27 -0700)
commitcd3893300ae82ebd5c2dfdbfdd3d251b4127127f
treecd6e04b4a4842cdd6d479446b8c4be0f8415aa12
parent840cb27f235e1b96304ef14c5ba08d926e175c05
parent6a266ce2aef44a2d0164553d711ef9c1fa7fd77c
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop