Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorhwg <hwg@rock-chips.com>
Tue, 6 Nov 2012 12:05:46 +0000 (20:05 +0800)
committerhwg <hwg@rock-chips.com>
Tue, 6 Nov 2012 12:05:46 +0000 (20:05 +0800)

Trivial merge