Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorwlf <wulf@rock-chips.com>
Sat, 10 Aug 2013 03:02:02 +0000 (11:02 +0800)
committerwlf <wulf@rock-chips.com>
Sat, 10 Aug 2013 03:02:02 +0000 (11:02 +0800)

Trivial merge