Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorCMY <cmy@rock-chips.com>
Mon, 18 Jul 2011 10:02:10 +0000 (18:02 +0800)
committerCMY <cmy@rock-chips.com>
Mon, 18 Jul 2011 10:02:10 +0000 (18:02 +0800)
commit7c8457e31b6f7a88d46f378ac9e2e9e457e393b4
treebb07436e8643c4d787dab9a712c0a9452a769043
parentb9094677f7a1a4b6df741e59fb7f55eaa5f5836c
parent3e6d9ab94abd3b1a0ad589cece1fe5717de17d9c
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop