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

Trivial merge