Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorgwl <gwl@rock-chips.com>
Tue, 18 Dec 2012 06:35:35 +0000 (14:35 +0800)
committergwl <gwl@rock-chips.com>
Tue, 18 Dec 2012 06:35:35 +0000 (14:35 +0800)

Trivial merge