Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into new
authorCMY <cmy@rock-chips.com>
Sun, 1 Apr 2012 06:42:48 +0000 (14:42 +0800)
committerCMY <cmy@rock-chips.com>
Sun, 1 Apr 2012 06:42:48 +0000 (14:42 +0800)

Trivial merge