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)

Trivial merge