Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoryangkai <yangkai@ubuntu-fs>
Thu, 17 Feb 2011 08:57:37 +0000 (16:57 +0800)
committeryangkai <yangkai@ubuntu-fs>
Thu, 17 Feb 2011 08:57:37 +0000 (16:57 +0800)

Trivial merge