Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
author蓝斌元 <lby@rock-chips.com>
Thu, 7 Mar 2013 02:18:40 +0000 (10:18 +0800)
committer蓝斌元 <lby@rock-chips.com>
Thu, 7 Mar 2013 02:18:40 +0000 (10:18 +0800)

Trivial merge