Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorlintao <lintao@rock-chips.com>
Fri, 7 Mar 2014 12:13:34 +0000 (20:13 +0800)
committerlintao <lintao@rock-chips.com>
Fri, 7 Mar 2014 12:13:34 +0000 (20:13 +0800)

Trivial merge