Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0
authoryangkai <yk@rock-chips.com>
Thu, 15 Dec 2011 01:38:39 +0000 (09:38 +0800)
committeryangkai <yk@rock-chips.com>
Thu, 15 Dec 2011 01:38:39 +0000 (09:38 +0800)

Trivial merge