Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Tue, 12 Apr 2011 03:21:18 +0000 (11:21 +0800)
committer蔡枫 <cf@rock-chips.com>
Tue, 12 Apr 2011 03:21:18 +0000 (11:21 +0800)
commit994b4b7a870b3b03b66ddcddf2cf297e8d33867d
tree64aa685224b75185ae721d8432179df7fb0798a0
parent3c694da386736dd62ae9fb1d18332d2dcfb4a8ff
parentdfd00c885d27331b92c6218b328946fb1d44a01a
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop