Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorlibing <libing@rock-chips.com>
Sun, 30 Mar 2014 15:08:30 +0000 (23:08 +0800)
committerlibing <libing@rock-chips.com>
Sun, 30 Mar 2014 15:08:30 +0000 (23:08 +0800)

Trivial merge