Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorddl <ddl@rock-chips.com>
Thu, 23 Aug 2012 02:44:41 +0000 (10:44 +0800)
committerddl <ddl@rock-chips.com>
Thu, 23 Aug 2012 02:44:41 +0000 (10:44 +0800)

Trivial merge