Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into rk2926
authorwuhao@rock-chips.com <wuhao@rock-chips.com>
Wed, 17 Oct 2012 10:29:53 +0000 (18:29 +0800)
committerwuhao@rock-chips.com <wuhao@rock-chips.com>
Wed, 17 Oct 2012 10:29:53 +0000 (18:29 +0800)

Trivial merge