Merge branch 'develop-3.0' of ssh://192.168.1.29/rk/kernel into develop-3.0
authorJacobChen <cc@rock-chips.com>
Sat, 19 Nov 2011 12:15:57 +0000 (20:15 +0800)
committerJacobChen <cc@rock-chips.com>
Sat, 19 Nov 2011 12:15:57 +0000 (20:15 +0800)
commit55eb32327f39d86f8d61eb5aa54d0577e1f97923
treeb92aa9eef83c9e82e937ad2af954ba6e20e0cd1e
parent12ecad75112ae6bc5ff9e6a8d57b649847152390
parent6d72cf814966fefc274ee10031ad1e1d5d1e7641
Merge branch 'develop-3.0' of ssh://192.168.1.29/rk/kernel into develop-3.0