Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-omap1/board-nokia770.c between commit
ab6f7751905e5cf713d081dbb3b97b8f6909ab34 ("Removing dead OMAP_DSP") from
Linus' tree and commit 426d31071ac476ea62c62656b242930c17b58c00 ("fix
printk typo 'faild'") from the trivial tree.

The former removes the code that the latter is updating.  So I just
removed it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[ message continues ]

Hi Stephen,

I have now merged Linus' master into for-next branch, so this conflict 
should now be gone.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--

[ message continues ]