Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlzg <lzg@rockchip.com>
Mon, 15 Aug 2011 10:47:16 +0000 (18:47 +0800)
committerlzg <lzg@rockchip.com>
Mon, 15 Aug 2011 10:47:16 +0000 (18:47 +0800)

Trivial merge