Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10...
authorZheng Yang <zhengyang@rock-chips.com>
Sat, 12 Jul 2014 07:04:42 +0000 (15:04 +0800)
committerZheng Yang <zhengyang@rock-chips.com>
Sat, 12 Jul 2014 07:04:42 +0000 (15:04 +0800)

Trivial merge