Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorzsq <zsq@rock-chips.com>
Thu, 21 Jun 2012 03:00:01 +0000 (11:00 +0800)
committerzsq <zsq@rock-chips.com>
Thu, 21 Jun 2012 03:00:01 +0000 (11:00 +0800)

Trivial merge