Subject: linux-next: manual merge of the trivial tree with the arm tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 8 Feb 2010 15:48:40 +1100

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/plat-s5pc1xx/irq.c between commit
be97162d47b2e067f9d21097650f2f0405dacc9f ("ARM: S5PC1XX: Use common UART
IRQ handling code") from the arm tree and commit
ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
fixes") from the trivial tree.

The former removes the comment updated by the latter.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/