Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into hwg
authorCMY <cmy@rock-chips.com>
Fri, 30 Mar 2012 02:07:28 +0000 (10:07 +0800)
committerCMY <cmy@rock-chips.com>
Fri, 30 Mar 2012 02:07:28 +0000 (10:07 +0800)

Trivial merge