Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into rk30/box/4.4_r1/develop
authorsugar <sugar.zhang@rock-chips.com>
Mon, 8 Dec 2014 01:44:14 +0000 (09:44 +0800)
committersugar <sugar.zhang@rock-chips.com>
Mon, 8 Dec 2014 01:44:14 +0000 (09:44 +0800)

Trivial merge