Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into rk30_phone
author蓝斌元 <lby@rock-chips.com>
Fri, 4 May 2012 02:41:55 +0000 (10:41 +0800)
committer蓝斌元 <lby@rock-chips.com>
Fri, 4 May 2012 02:41:55 +0000 (10:41 +0800)

Trivial merge