Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10...
authorwdc <wdc@rock-chips.com>
Sat, 12 Jul 2014 08:32:35 +0000 (16:32 +0800)
committerwdc <wdc@rock-chips.com>
Sat, 12 Jul 2014 08:32:35 +0000 (16:32 +0800)

Trivial merge