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)

Trivial merge