Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorlintao <lintao@rock-chips.com>
Fri, 2 Aug 2013 10:13:13 +0000 (18:13 +0800)
committerlintao <lintao@rock-chips.com>
Fri, 2 Aug 2013 10:13:13 +0000 (18:13 +0800)
commitef39e5ccd31a1a98f6f71788efa0d06ddff7001e
treee955c83357cb3c99475a73c99a9f2cd044f776f2
parentea8dee539185a8002976b8d8701184390a72d0fc
parentc426173536a097548d73f902541f56ac1e950d4d
Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0