Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorxbw <xbw@rock-chips.com>
Fri, 7 Jun 2013 09:03:20 +0000 (17:03 +0800)
committerxbw <xbw@rock-chips.com>
Fri, 7 Jun 2013 09:03:20 +0000 (17:03 +0800)

Trivial merge