Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorxbw <xbw@rock-chips.com>
Tue, 25 Feb 2014 04:35:25 +0000 (12:35 +0800)
committerxbw <xbw@rock-chips.com>
Tue, 25 Feb 2014 04:35:25 +0000 (12:35 +0800)

Trivial merge