Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorhwg <hwg@rock-chips.com>
Mon, 14 Jan 2013 15:08:17 +0000 (23:08 +0800)
committerhwg <hwg@rock-chips.com>
Mon, 14 Jan 2013 15:08:17 +0000 (23:08 +0800)

Trivial merge