Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlzg <lzg@rockchip.com>
Tue, 26 Jul 2011 09:37:34 +0000 (17:37 +0800)
committerlzg <lzg@rockchip.com>
Tue, 26 Jul 2011 09:37:34 +0000 (17:37 +0800)

Trivial merge