Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorwlf <wulf@rock-chips.com>
Wed, 26 Mar 2014 12:59:24 +0000 (20:59 +0800)
committerwlf <wulf@rock-chips.com>
Wed, 26 Mar 2014 12:59:24 +0000 (20:59 +0800)

Trivial merge