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

From: Stephen Rothwell <hidden>
Date: 2010-02-08 04:48:39
Also in: lkml

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/plat-s3c64xx/irq.c between commit
51022cf6591ae2945960d034788bdeffa28cde13 ("ARM: SAMSUNG: Move IRQ UART
handling for newer devices to plat-samsung") 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                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Attachments

(unnamed) [application/pgp-signature] 198 bytes

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help