Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoryangkai <yangkai@ubuntu-fs>
Fri, 17 Jun 2011 07:13:35 +0000 (15:13 +0800)
committeryangkai <yangkai@ubuntu-fs>
Fri, 17 Jun 2011 07:13:35 +0000 (15:13 +0800)
commit68d0b413f8bee6bb503eb9819751212e8cff60e9
tree9eda7a6e5aef15a7f56ae401bd3a87768e9ce518
parent7de6ef11de5d07ee6195f0f5598f32efbcda9a31
parente9d88751446449641dbb9dcb87059777b70ab4c1
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop