Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorcwz <cwz@rockchips.com>
Wed, 20 Apr 2011 03:39:56 +0000 (20:39 -0700)
committercwz <cwz@rockchips.com>
Wed, 20 Apr 2011 03:39:56 +0000 (20:39 -0700)

Trivial merge