Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into v86-develop-1106
authorwuhao <wuhao@wuhao@rock-chips.com>
Wed, 7 Nov 2012 02:25:06 +0000 (10:25 +0800)
committerwuhao <wuhao@wuhao@rock-chips.com>
Wed, 7 Nov 2012 02:25:06 +0000 (10:25 +0800)

Trivial merge