Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Tue, 28 Jun 2011 11:48:47 +0000 (19:48 +0800)
committer蔡枫 <cf@rock-chips.com>
Tue, 28 Jun 2011 11:48:47 +0000 (19:48 +0800)
commit1845e22435406abcb469fae7e3982148c96bb842
treee567a4132a7556f1ff303ddcf917cf799921c334
parent5d00576a6ec320710fbd9ae0e1b9debe9a863467
parent509f2358483c39bc5d2a91a814995b7821ce33d7
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop