Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorzhaoyifeng <zyf@rock-chips.com>
Sat, 31 Mar 2012 10:19:20 +0000 (18:19 +0800)
committerzhaoyifeng <zyf@rock-chips.com>
Sat, 31 Mar 2012 10:19:20 +0000 (18:19 +0800)

Trivial merge