Subject: linux-next: manual merge of the m68knommu tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 25 May 2011 11:04:24 +1000

Hi Greg,

Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/kernel/m68k_ksyms.c between commit a697dc934f52 ("m68k: merge
non-mmu and mmu versions of m68k_ksyms.c") from Linus' tree and commit
e05f64c1bac9 ("m68k: merge non-mmu and mmu versions of m68k_ksyms.c")
from the m68knommu tree.

Two (slightly different) versions of the same change  I used the version
from the m68knommu tree as that was comitted later.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/

P.S. Greg, do I need to change your contact address?