Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop
authorwdc <wdc@rock-chips.com>
Sat, 24 Mar 2012 08:00:36 +0000 (16:00 +0800)
committerwdc <wdc@rock-chips.com>
Sat, 24 Mar 2012 08:00:36 +0000 (16:00 +0800)

Trivial merge