Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorRich.jiangyk <jyk@rock-chips.com>
Thu, 16 Sep 2010 08:47:25 +0000 (16:47 +0800)
committerRich.jiangyk <jyk@rock-chips.com>
Thu, 16 Sep 2010 08:47:25 +0000 (16:47 +0800)
commitd1babc485ec304685148aef494384353179fe648
treece5e8fef3a38e3d315e0e96bbe9849bb6bcdc8a3
parent29b3db33b44bcbb0d9c399aad9939446927c9516
parent0cdb46c5d650490ffcfb05ca32383828968362b3
Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop