Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into xxh_develop
authorxxh <xxh@rock-chip.com>
Fri, 9 Jan 2015 08:47:56 +0000 (16:47 +0800)
committerxxh <xxh@rock-chip.com>
Fri, 9 Jan 2015 08:47:56 +0000 (16:47 +0800)

Trivial merge