Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Tue, 9 Aug 2011 13:03:51 +0000 (21:03 +0800)
committer蔡枫 <cf@rock-chips.com>
Tue, 9 Aug 2011 13:03:51 +0000 (21:03 +0800)
commit2f2b23a302549abb102b92d5b3b8aeb6264ace22
tree027ded8f9f4474bbfe8c38cf6f759967b0ef8c64
parent19d553ce177a355e7e78021fbeacf3a2e160e0a2
parent94046ed194ec59a204b66f8a26939ac934893554
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop