Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorZheng Yang <zhengyang@rock-chips.com>
Thu, 27 Sep 2012 06:16:01 +0000 (14:16 +0800)
committerZheng Yang <zhengyang@rock-chips.com>
Thu, 27 Sep 2012 06:16:01 +0000 (14:16 +0800)

Trivial merge