Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorwdc <wdc@rock-chips.com>
Mon, 1 Jul 2013 07:54:31 +0000 (15:54 +0800)
committerwdc <wdc@rock-chips.com>
Mon, 1 Jul 2013 07:54:31 +0000 (15:54 +0800)

Trivial merge