Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlzg <lzg@rockchip.com>
Wed, 10 Aug 2011 01:37:13 +0000 (09:37 +0800)
committerlzg <lzg@rockchip.com>
Wed, 10 Aug 2011 01:37:13 +0000 (09:37 +0800)

Trivial merge