Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlzg <lzg@rockchip.com>
Mon, 1 Aug 2011 03:33:12 +0000 (11:33 +0800)
committerlzg <lzg@rockchip.com>
Mon, 1 Aug 2011 03:33:12 +0000 (11:33 +0800)
commit103e6d220dccfd05085f4eca0662e85157944808
tree811392188d39daa810d5a94271d5c306c99ce807
parenta6e03b671d2d6ef991283dff80645fc3719d61d6
parentf2fa41463e844ae8f80ad0aa7538e6f0990fae37
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop