From: Joe Perches <joe@perches.com>
Date: Tue, 18 Sep 2007 21:50:01 -0700

I rebased against yesterday's net-2.6.24

Please pull from:

git://repo.or.cz/linux-2.6/trivial-mods.git net-2.6.24-fordave

You didn't "rebase" you "merged" and this makes your tree a complete
mess.

When you do a real "rebase", you clone a fresh new tree from mine and
add only your patches on top.

Your tree as-is is difficult for me to pull from because it contains
all kinds of messy merges and merge error fixups.

Can you just extract out one single patch that does the MAC_FMT change
and get that to me somehow?  Either by adding it into a fresh
net-2.6.24 clone, or as a patch.  Both ways are fine.