Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorfang <fang@fang-desktop.(none)>
Thu, 18 Aug 2011 03:40:54 +0000 (11:40 +0800)
committerfang <fang@fang-desktop.(none)>
Thu, 18 Aug 2011 03:40:54 +0000 (11:40 +0800)

Trivial merge