Merge branch 'develop-3.0' of ssh://192.168.1.29/rk/kernel into develop-3.0
authoryxj <yxj@rock-chips.com>
Sat, 19 Nov 2011 10:39:57 +0000 (18:39 +0800)
committeryxj <yxj@rock-chips.com>
Sat, 19 Nov 2011 10:39:57 +0000 (18:39 +0800)

Trivial merge