Merge branch 'develop-3.0-rk2928' of ssh://10.10.10.29/rk/kernel into develop-3.0...
authorzsq <zsq@rock-chips.com>
Thu, 16 Aug 2012 06:43:23 +0000 (14:43 +0800)
committerzsq <zsq@rock-chips.com>
Thu, 16 Aug 2012 06:43:23 +0000 (14:43 +0800)

Trivial merge