Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Fri, 6 May 2011 05:39:40 +0000 (13:39 +0800)
committer蔡枫 <cf@rock-chips.com>
Fri, 6 May 2011 05:39:40 +0000 (13:39 +0800)
commit9a1bcc2cac8c25866a14a3c4f4a78f85b3ba1156
tree8d9dd941363b51ff6b875cd14bc599aa2ee85c1a
parente4e744cf45293a014f7b5981d4fca0f688a3f7f6
parentacd164e89a374bdf8a70d1c1560cc45d6f92b77a
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop