No subject
Tue Mar 23 23:22:36 CET 2010
>git.openmoko.org/git/kernel</a><br>
=A0 ee4642a..973a41f =A0andy-tracking -> origin/andy-tracking<br>
=A0* [new branch] =A0 =A0 =A0andy-tracking-nohist -> origin/andy-trackin=
g-nohist<br>
=A0* [new branch] =A0 =A0 =A0ar6000-2.6.31 -> origin/ar6000-2.6.31<br>
=A0* [new branch] =A0 =A0 =A0ar6000-2.6.32 -> origin/ar6000-2.6.32<br>
=A0+ 9aa190a...d9235e3 balaji-tracking -> origin/balaji-tracking =A0(for=
ced update)<br>
=A0* [new branch] =A0 =A0 =A0bq27000-2.6.31 -> origin/bq27000-2.6.31<br>
=A0* [new branch] =A0 =A0 =A0bq27000-2.6.32 -> origin/bq27000-2.6.32<br>
=A0* [new branch] =A0 =A0 =A0drm-tracking -> origin/drm-tracking<br>
=A0* [new branch] =A0 =A0 =A0gdrm-2.6.32 -> origin/gdrm-2.6.32<br>
=A0* [new branch] =A0 =A0 =A0glamo-2.6.31 -> origin/glamo-2.6.31<br>
=A0* [new branch] =A0 =A0 =A0glamo-2.6.32 -> origin/glamo-2.6.32<br>
=A0* [new branch] =A0 =A0 =A0gta01-machine-2.6.31 -> origin/gta01-machin=
e-2.6.31<br>
=A0* [new branch] =A0 =A0 =A0gta02-machine-2.6.31 -> origin/gta02-machin=
e-2.6.31<br>
=A0* [new branch] =A0 =A0 =A0gta02-machine-2.6.32 -> origin/gta02-machin=
e-2.6.32<br>
=A0* [new branch] =A0 =A0 =A0gta02-machine-devices-2.6.31 -> origin/gta0=
2-machine-devices-2.6.31<br>
=A0* [new branch] =A0 =A0 =A0gta02-machine-devices-2.6.32 -> origin/gta0=
2-machine-devices-2.6.32<br>
=A0* [new branch] =A0 =A0 =A0gta02-vibrator-2.6.31 -> origin/gta02-vibra=
tor-2.6.31<br>
=A0* [new branch] =A0 =A0 =A0jbt6k74-2.6.31 -> origin/jbt6k74-2.6.31<br>
=A0* [new branch] =A0 =A0 =A0jbt6k74-2.6.32 -> origin/jbt6k74-2.6.32<br>
=A0 b460dd0..557e993 =A0master =A0 =A0 -> origin/master<br>
=A0* [new branch] =A0 =A0 =A0master-nohist -> origin/master-nohist<br>
=A0 794516c..2515f9a =A0mokopatches-tracking -> origin/mokopatches-trac=
king<br>
=A0* [new branch] =A0 =A0 =A0mokopatches-tracking-nohist -> origin/mokop=
atches-tracking-nohist<br>
=A0* [new branch] =A0 =A0 =A0om-2.6.31 =A0-> origin/om-2.6.31<br>
=A0* [new branch] =A0 =A0 =A0om-extra-2.6.31 -> origin/om-extra-2.6.31<b=
r>
=A0* [new branch] =A0 =A0 =A0om-gta01-2.6.31 -> origin/om-gta01-2.6.31<b=
r>
=A0* [new branch] =A0 =A0 =A0om-gta02-2.6.31 -> origin/om-gta02-2.6.31<b=
r>
=A0* [new branch] =A0 =A0 =A0om-gta02-2.6.32 -> origin/om-gta02-2.6.32<b=
r>
=A0* [new branch] =A0 =A0 =A0om-s3c-2.6.31 -> origin/om-s3c-2.6.31<br>
=A0* [new branch] =A0 =A0 =A0om-s3c-2.6.32 -> origin/om-s3c-2.6.32<br>
=A0* [new branch] =A0 =A0 =A0pcf50606-2.6.31 -> origin/pcf50606-2.6.31<b=
r>
=A0* [new branch] =A0 =A0 =A0pcf50633-2.6.31 -> origin/pcf50633-2.6.31<b=
r>
=A0* [new branch] =A0 =A0 =A0pcf50633-2.6.32 -> origin/pcf50633-2.6.32<b=
r>
=A0* [new branch] =A0 =A0 =A0pending-tracking -> origin/pending-tracking=
<br>
=A0* [new branch] =A0 =A0 =A0pending-tracking-nohist -> origin/pending-t=
racking-nohist<br>
=A0* [new branch] =A0 =A0 =A0platform_battery-2.6.31 -> origin/platform_=
battery-2.6.31<br>
=A0* [new branch] =A0 =A0 =A0platform_battery-2.6.32 -> origin/platform_=
battery-2.6.32<br>
=A0* [new branch] =A0 =A0 =A0proposed =A0 -> origin/proposed<br>
=A0* [new branch] =A0 =A0 =A0s3c-touchscreen-2.6.31 -> origin/s3c-touchs=
creen-2.6.31<br>
=A0* [new branch] =A0 =A0 =A0s3c-touchscreen-2.6.32 -> origin/s3c-touchs=
creen-2.6.32<br>
=A0 cfea911..f19f259 =A0stable =A0 =A0 -> origin/stable<br>
=A0 1b17c67..893e864 =A0stable-tracking -> origin/stable-tracking<br>
=A0* [new branch] =A0 =A0 =A0stable-tracking-nohist -> origin/stable-tra=
cking-nohist<br>
=A0* [new branch] =A0 =A0 =A0wm8753-2.6.31 -> origin/wm8753-2.6.31<br>
=A0* [new branch] =A0 =A0 =A0wm8753-2.6.32 -> origin/wm8753-2.6.32<br>
Updating b460dd0..557e993<br>
error: Entry '.mailmap' would be overwritten by merge. Cannot merge=
.<br>
<br>
</blockquote></div><br>I have similar experience with this merge problem bu=
t the git repository of openmoko works for me. If repository is not importa=
nt then try a snapshot of a stable or latest kernel.<br clear=3D"all"><br>
-- <br>Shaz<br><br>
--000e0cd4d328389b94048442eff5--
More information about the openmoko-kernel
mailing list
