Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorfang <fang@fang-desktop.(none)>
Thu, 30 Dec 2010 07:39:22 +0000 (15:39 +0800)
committerfang <fang@fang-desktop.(none)>
Thu, 30 Dec 2010 07:39:22 +0000 (15:39 +0800)

Trivial merge