Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorroger <cz@rock-chips.com>
Thu, 14 Aug 2014 08:10:58 +0000 (16:10 +0800)
committerroger <cz@rock-chips.com>
Thu, 14 Aug 2014 08:10:58 +0000 (16:10 +0800)

Trivial merge