Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorlintao <lintao@rock-chips.com>
Wed, 4 Sep 2013 03:34:44 +0000 (11:34 +0800)
committerlintao <lintao@rock-chips.com>
Wed, 4 Sep 2013 03:34:44 +0000 (11:34 +0800)

Trivial merge