Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10...
author陈亮 <cl@rock-chips.com>
Thu, 31 Jul 2014 12:37:07 +0000 (05:37 -0700)
committer陈亮 <cl@rock-chips.com>
Thu, 31 Jul 2014 12:37:07 +0000 (05:37 -0700)

Trivial merge