Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorcwz <cwz@rockchips.com>
Wed, 27 Apr 2011 02:42:16 +0000 (19:42 -0700)
committercwz <cwz@rockchips.com>
Wed, 27 Apr 2011 02:42:16 +0000 (19:42 -0700)

Trivial merge