Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0
authoryangkai <yk@rock-chips.com>
Tue, 20 Dec 2011 03:52:48 +0000 (11:52 +0800)
committeryangkai <yk@rock-chips.com>
Tue, 20 Dec 2011 03:52:48 +0000 (11:52 +0800)

Trivial merge