Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorxbw <xbw@rock-chips.com>
Tue, 4 Mar 2014 07:14:42 +0000 (15:14 +0800)
committerxbw <xbw@rock-chips.com>
Tue, 4 Mar 2014 07:14:42 +0000 (15:14 +0800)

Trivial merge