Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0
authoryangkai <yk@rock-chips.com>
Tue, 20 Dec 2011 07:16:51 +0000 (15:16 +0800)
committeryangkai <yk@rock-chips.com>
Tue, 20 Dec 2011 07:16:51 +0000 (15:16 +0800)
commit081485562911dcb831d90fdc9687e211c414f495
tree65f240357487c3fce0a8f87265040e09ee3daf4f
parent4e09869c17005adb13a318192fd04949b736a055
parent35ab4255763b59c9bc7833cc836c432c586849d4
Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0