Merge branch 'develop' of dxj@10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorroot <root@dxj.(none)>
Fri, 23 Jul 2010 10:02:54 +0000 (18:02 +0800)
committerroot <root@dxj.(none)>
Fri, 23 Jul 2010 10:02:54 +0000 (18:02 +0800)

Trivial merge