Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorfang <fang@fang-desktop.(none)>
Wed, 17 Aug 2011 01:52:32 +0000 (09:52 +0800)
committerfang <fang@fang-desktop.(none)>
Wed, 17 Aug 2011 01:52:32 +0000 (09:52 +0800)

Trivial merge