Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorwdc <wdc@rock-chips.com>
Thu, 11 Sep 2014 11:12:27 +0000 (19:12 +0800)
committerwdc <wdc@rock-chips.com>
Thu, 11 Sep 2014 11:12:27 +0000 (19:12 +0800)

Trivial merge