Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorxbw <xbw@rock-chips.com>
Fri, 28 Sep 2012 10:19:25 +0000 (18:19 +0800)
committerxbw <xbw@rock-chips.com>
Fri, 28 Sep 2012 10:19:25 +0000 (18:19 +0800)

Trivial merge