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)
commit468a165e21e8ae04e9aa58a9c3b543ebb42f7112
tree41d0d6f9a8eaaa3a279102a5beec8c2804190e5f
parent64d9aa3dab4d94b0d25f2bde27a401f810e642dd
parenta23bd433d410b7f1bf7a453c48b240ebc83e26e2
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop