Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authoryangkai <yk@rock-chips.com>
Mon, 3 Sep 2012 10:07:12 +0000 (18:07 +0800)
committeryangkai <yk@rock-chips.com>
Mon, 3 Sep 2012 10:07:12 +0000 (18:07 +0800)

Trivial merge