Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorroger <cz@rock-chips.com>
Wed, 13 Aug 2014 11:05:41 +0000 (19:05 +0800)
committerroger <cz@rock-chips.com>
Wed, 13 Aug 2014 11:05:41 +0000 (19:05 +0800)

Trivial merge