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 03:52:48 +0000 (11:52 +0800)
committeryangkai <yk@rock-chips.com>
Tue, 20 Dec 2011 03:52:48 +0000 (11:52 +0800)
commit4e09869c17005adb13a318192fd04949b736a055
tree8fceabaea5be2b3e1a97e272c97c224787c4b69b
parent973e0817e03e49e5ceb73df171f34a3e1ff2a384
parenteb6185eb408757457179f6db4ba244df46daadda
Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0