Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorhuang zhibao <hzb@rock-chips.com>
Mon, 16 Mar 2015 09:39:19 +0000 (17:39 +0800)
committerhuang zhibao <hzb@rock-chips.com>
Mon, 16 Mar 2015 09:39:19 +0000 (17:39 +0800)

Trivial merge