Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authoryangkai <yk@rock-chips.com>
Tue, 21 Aug 2012 06:13:14 +0000 (14:13 +0800)
committeryangkai <yk@rock-chips.com>
Tue, 21 Aug 2012 06:13:14 +0000 (14:13 +0800)

Trivial merge