Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorhwg <hwg@rock-chips.com>
Sun, 16 Sep 2012 04:24:09 +0000 (12:24 +0800)
committerhwg <hwg@rock-chips.com>
Sun, 16 Sep 2012 04:24:09 +0000 (12:24 +0800)

Trivial merge