Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorcwz <cwz@rockchips.com>
Wed, 3 Aug 2011 08:10:48 +0000 (01:10 -0700)
committercwz <cwz@rockchips.com>
Wed, 3 Aug 2011 08:10:48 +0000 (01:10 -0700)

Trivial merge