Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorhxy <hxy@rock-chips.com>
Fri, 14 Dec 2012 08:21:58 +0000 (16:21 +0800)
committerhxy <hxy@rock-chips.com>
Fri, 14 Dec 2012 08:21:58 +0000 (16:21 +0800)

Trivial merge