Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorwdc <wdc@rock-chips.com>
Fri, 16 Aug 2013 09:27:38 +0000 (17:27 +0800)
committerwdc <wdc@rock-chips.com>
Fri, 16 Aug 2013 09:27:38 +0000 (17:27 +0800)

Trivial merge