Merge branch 'develop-3.0' of ssh://rk29/rk/kernel into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Mon, 8 Oct 2012 02:35:25 +0000 (10:35 +0800)
committer黄涛 <huangtao@rock-chips.com>
Mon, 8 Oct 2012 02:35:25 +0000 (10:35 +0800)

Trivial merge