Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoryangkai <yangkai@ubuntu-fs>
Thu, 23 Jun 2011 10:18:55 +0000 (18:18 +0800)
committeryangkai <yangkai@ubuntu-fs>
Thu, 23 Jun 2011 10:18:55 +0000 (18:18 +0800)

Trivial merge