Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorfang <fang@fang-desktop.(none)>
Wed, 26 Jan 2011 02:09:26 +0000 (10:09 +0800)
committerfang <fang@fang-desktop.(none)>
Wed, 26 Jan 2011 02:09:26 +0000 (10:09 +0800)

Trivial merge