Merge branch 'develop-3.0-rk30' of ssh://10.10.10.29/rk/kernel into develop-3.0-rk30
authorzhaoyifeng <zyf@rock-chips.com>
Tue, 7 Feb 2012 07:18:15 +0000 (15:18 +0800)
committerzhaoyifeng <zyf@rock-chips.com>
Tue, 7 Feb 2012 07:18:15 +0000 (15:18 +0800)

Trivial merge