Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorlibing <libing@rock-chips.com>
Sat, 24 Aug 2013 08:23:01 +0000 (16:23 +0800)
committerlibing <libing@rock-chips.com>
Sat, 24 Aug 2013 08:23:01 +0000 (16:23 +0800)

Trivial merge