Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoryangkai <yangkai@ubuntu-fs>
Fri, 15 Apr 2011 09:45:43 +0000 (17:45 +0800)
committeryangkai <yangkai@ubuntu-fs>
Fri, 15 Apr 2011 09:45:43 +0000 (17:45 +0800)
commit5e84327c61ecb23b2d719736047f2881dd3f5ae7
tree43635b8738a3c1a4a931c3126082c3b87e6891b1
parent495796b364dfd854a1fad5cba7eeddbaf0fad963
parent1afd4695d963670433125d1bd8d483cf9754e94b
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop