[mc1322x] Contiki tree resync

[Jon Smirl]

We need to work on getting the Contiki tree fixed up. I'm unable to
merge it back with the current Contiki trunk. There are two main
problems. First I don't know the exact commit you used as a base when
forking from Contiki. Second, you had CVS keyword expansion turned on
when you did the git import.  The keywords all expand differently now
in Contiki CVS. (There is option to disable expansion on git
cvsimport). All of those expansions generate a lot of noise diffs.

I used a sed script to remove all of the expansion diffs but I still
can't get a clean merge. That's because my CVS import tree doesn't
match yours exactly.

To fix this we need the exact CVS import tree you made. It should
still be sitting in your original repository. You didn't push it out
to the server.

Once we find the exact tree you should be able to easily generate a
diff. Just diff the current head against the head of the CVS import
tree.

We can take that diff and apply it against the current Contiki tree
imported with keyword expansion turned off. We can also push the newly
imported tree out to the server. From then on it will be easier to
merge.

I'm still playing with it trying to make the correct base tree. I have
a new import running that leave the keywords expanded. I may also be
able to extract your changes by cherry picking patches you made since
you are the only commiter.

-- 
Jon Smirl
jonsmirl at gmail.com