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

Trivial merge