Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoryangkai <yangkai@ubuntu-fs>
Mon, 11 Apr 2011 03:40:55 +0000 (11:40 +0800)
committeryangkai <yangkai@ubuntu-fs>
Mon, 11 Apr 2011 03:40:55 +0000 (11:40 +0800)

Trivial merge