Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author陈辉 <chenhui@rk29.(none)>
Fri, 4 Mar 2011 10:05:30 +0000 (18:05 +0800)
committer陈辉 <chenhui@rk29.(none)>
Fri, 4 Mar 2011 10:05:30 +0000 (18:05 +0800)
commit2997fa8f6542512a4ffb499f4f5310b567a7dea7
tree590342cdd6c90cfdc56969055f74220fd5eae03d
parent3ddadcad61a2184b7a279ffdee0363afbe741c8e
parentf1a47fe01325a8440e98e4cb4c7689ddfe68a079
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop