Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop
authorwdc <wdc@rock-chips.com>
Tue, 12 Jun 2012 04:27:12 +0000 (12:27 +0800)
committerwdc <wdc@rock-chips.com>
Tue, 12 Jun 2012 04:27:12 +0000 (12:27 +0800)

Trivial merge