Merge branch 'develop-3.0-rk30' of ssh://10.10.10.29/rk/kernel into develop-3.0-rk30
authorzsq <zsq@rock-chip.com>
Thu, 1 Mar 2012 07:41:18 +0000 (23:41 -0800)
committerzsq <zsq@rock-chip.com>
Thu, 1 Mar 2012 07:41:18 +0000 (23:41 -0800)

Trivial merge