Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorywj <ywj@rockchip.com>
Fri, 17 Aug 2012 02:03:12 +0000 (10:03 +0800)
committerywj <ywj@rockchip.com>
Fri, 17 Aug 2012 02:03:12 +0000 (10:03 +0800)

Trivial merge