Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorlintao <lintao@rock-chips.com>
Tue, 18 Mar 2014 01:48:32 +0000 (09:48 +0800)
committerlintao <lintao@rock-chips.com>
Tue, 18 Mar 2014 01:48:32 +0000 (09:48 +0800)

Trivial merge