Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorzwp <zwp@rock-chips.com>
Fri, 30 Dec 2011 06:18:00 +0000 (14:18 +0800)
committerzwp <zwp@rock-chips.com>
Fri, 30 Dec 2011 06:18:00 +0000 (14:18 +0800)

Trivial merge