On Tue, 17 Jun 2008 22:37:07 -0700 (PDT) David Miller [off-list ref] wrote:

It's part of a tree-wide removal of CONFIG_SUN4.  If Stephen doesn't
mind making this minor merge fixup all the time, it's probably
best to keep it in the sparc tree.

Let me know if you disagree :-)

I don't mind.  git rerere is my friend :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/