Merge branch 'develop-3.0' of ssh://192.168.1.29/rk/kernel into develop-3.0
authorJacobChen <cc@rock-chips.com>
Sat, 19 Nov 2011 12:15:57 +0000 (20:15 +0800)
committerJacobChen <cc@rock-chips.com>
Sat, 19 Nov 2011 12:15:57 +0000 (20:15 +0800)

Trivial merge