Merge branch 'develop-3.0' of ssh://192.168.1.29/rk/kernel into develop-3.0
authoryangkai <yk@rock-chips.com>
Tue, 22 Nov 2011 07:37:57 +0000 (15:37 +0800)
committeryangkai <yk@rock-chips.com>
Tue, 22 Nov 2011 07:37:57 +0000 (15:37 +0800)

Trivial merge