Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlzg <lzg@rockchip.com.cn>
Wed, 18 May 2011 13:54:07 +0000 (06:54 -0700)
committerlzg <lzg@rockchip.com.cn>
Wed, 18 May 2011 13:54:07 +0000 (06:54 -0700)

Trivial merge