Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorhuang zhibao <hzb@rock-chips.com>
Wed, 8 Oct 2014 09:38:14 +0000 (17:38 +0800)
committerhuang zhibao <hzb@rock-chips.com>
Wed, 8 Oct 2014 09:38:14 +0000 (17:38 +0800)

Trivial merge