Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorzwp <zwp@rock-chips.com>
Thu, 5 Jan 2012 03:40:31 +0000 (11:40 +0800)
committerzwp <zwp@rock-chips.com>
Thu, 5 Jan 2012 03:40:31 +0000 (11:40 +0800)

Trivial merge