Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
author陈亮 <cl@rock-chips.com>
Tue, 27 May 2014 06:35:41 +0000 (23:35 -0700)
committer陈亮 <cl@rock-chips.com>
Tue, 27 May 2014 06:35:41 +0000 (23:35 -0700)

Trivial merge