Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorZhaoyifeng <zyf@rock-chips.com>
Tue, 18 Mar 2014 13:24:31 +0000 (21:24 +0800)
committerZhaoyifeng <zyf@rock-chips.com>
Tue, 18 Mar 2014 13:24:31 +0000 (21:24 +0800)

Trivial merge