Merge branch 'develop-3.0' of 10.10.10.29:rk/kernel into develop-3.0
authorywj <ywj@rockchip.com>
Tue, 23 Jul 2013 11:08:44 +0000 (19:08 +0800)
committerywj <ywj@rockchip.com>
Tue, 23 Jul 2013 11:08:44 +0000 (19:08 +0800)

Trivial merge