Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorfang <fang@fang-desktop.(none)>
Tue, 7 Dec 2010 11:14:04 +0000 (19:14 +0800)
committerfang <fang@fang-desktop.(none)>
Tue, 7 Dec 2010 11:14:04 +0000 (19:14 +0800)

Trivial merge