Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlzg <lzg@rockchip.com>
Mon, 15 Aug 2011 10:47:16 +0000 (18:47 +0800)
committerlzg <lzg@rockchip.com>
Mon, 15 Aug 2011 10:47:16 +0000 (18:47 +0800)
commitdf225dcff95a031ef069719afce70fedb4be9bb7
tree372e175598d1b83ceec344506cebcc2f569e1488
parentb16334163953e41951895a05312bb3ad86bfca88
parentd3a79c847c60c1c5a445c7615df802df6163acf0
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop