lkml.org 
[lkml]   [2012]   [Sep]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the arm-soc tree with the l2-mtd tree
Hi all,

Today's linux-next merge of the arm-soc tree got conflicts in
drivers/mtd/nand/bcm_umi_nand.c and drivers/mtd/nand/nand_bcm_umi.h
between commit 07f4c69caf01 ("mtd: remove bcmring NAND driver") from the
l2-mtd tree and commit 878040ef831a ("ARM: bcmring: use proper MMIO
accessors") from the arm-soc tree.

I just removed the files and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-09-25 09:41    [W:0.350 / U:1.432 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site