Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorxbw <xbw@rock-chips.com>
Tue, 22 Jan 2013 09:59:07 +0000 (17:59 +0800)
committerxbw <xbw@rock-chips.com>
Tue, 22 Jan 2013 09:59:07 +0000 (17:59 +0800)

Trivial merge