Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorlyz <lyz@rock-chips.com>
Thu, 15 Aug 2013 08:07:54 +0000 (16:07 +0800)
committerlyz <lyz@rock-chips.com>
Thu, 15 Aug 2013 08:07:54 +0000 (16:07 +0800)

Trivial merge