Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorxbw <xbw@rock-chips.com>
Sun, 12 Aug 2012 05:33:05 +0000 (13:33 +0800)
committerxbw <xbw@rock-chips.com>
Sun, 12 Aug 2012 05:33:05 +0000 (13:33 +0800)

Trivial merge