Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorzhaoyifeng <zyf@rock-chips.com>
Sun, 1 Apr 2012 02:24:07 +0000 (10:24 +0800)
committerzhaoyifeng <zyf@rock-chips.com>
Sun, 1 Apr 2012 02:24:07 +0000 (10:24 +0800)

Trivial merge