Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorCMY <cmy@rock-chips.com>
Sat, 2 Jun 2012 09:27:06 +0000 (17:27 +0800)
committerCMY <cmy@rock-chips.com>
Sat, 2 Jun 2012 09:27:06 +0000 (17:27 +0800)

Trivial merge