Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10...
authorhuangzhibao <hzb@rock-chips.com>
Mon, 16 Mar 2015 12:09:07 +0000 (20:09 +0800)
committerhuangzhibao <hzb@rock-chips.com>
Mon, 16 Mar 2015 12:09:07 +0000 (20:09 +0800)

Trivial merge