Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlzg <lzg@rockchip.com.cn>
Fri, 6 May 2011 07:27:53 +0000 (00:27 -0700)
committerlzg <lzg@rockchip.com.cn>
Fri, 6 May 2011 07:27:53 +0000 (00:27 -0700)

Trivial merge