Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlzg <lzg@rockchip.com>
Fri, 12 Aug 2011 08:00:39 +0000 (16:00 +0800)
committerlzg <lzg@rockchip.com>
Fri, 12 Aug 2011 08:00:39 +0000 (16:00 +0800)
commitccf70001a61070ef0ae081b7ce7bcbffea0291df
treed06746f0e304e66221a7d8a1273ad4fe91befdfe
parent59f165b73cfa1237aaa32e9cbf7da72646bb4a9e
parentb7c84d116af879665eae4f26cc645f5739d97469
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop