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

Trivial merge