Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoryangkai <yangkai@ubuntu-fs>
Fri, 17 Jun 2011 07:13:35 +0000 (15:13 +0800)
committeryangkai <yangkai@ubuntu-fs>
Fri, 17 Jun 2011 07:13:35 +0000 (15:13 +0800)

Trivial merge