Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorchenli <chenli@rock-chips.com>
Mon, 10 Sep 2012 03:07:54 +0000 (11:07 +0800)
committerchenli <chenli@rock-chips.com>
Mon, 10 Sep 2012 03:07:54 +0000 (11:07 +0800)

Trivial merge