Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop
authorwdc <wdc@rock-chips.com>
Sat, 25 Feb 2012 06:07:25 +0000 (14:07 +0800)
committerwdc <wdc@rock-chips.com>
Sat, 25 Feb 2012 06:07:25 +0000 (14:07 +0800)

Trivial merge