Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorwdc <wdc@rock-chips.com>
Wed, 3 Sep 2014 01:23:39 +0000 (09:23 +0800)
committerwdc <wdc@rock-chips.com>
Wed, 3 Sep 2014 01:23:39 +0000 (09:23 +0800)

Trivial merge