Merge branch 'develop-3.0' of ssh://192.168.1.29/rk/kernel into develop-3.0
authorCMY <cmy@rock-chips.com>
Sun, 20 Nov 2011 06:10:58 +0000 (14:10 +0800)
committerCMY <cmy@rock-chips.com>
Sun, 20 Nov 2011 06:10:58 +0000 (14:10 +0800)

Trivial merge