[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20091203121533.f9de2dac.sfr@canb.auug.org.au>
Date: Thu, 3 Dec 2009 12:15:33 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Woodhouse <dwmw2@...radead.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Ralf Baechle <ralf@...ux-mips.org>,
Uwe Kleine-König
<u.kleine-koenig@...gutronix.de>,
Artem Bityutskiy <Artem.Bityutskiy@...ia.com>
Subject: linux-next: manual merge of the mtd tree with the tree
Hi David,
Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/nand/excite_nandflash.c between commit
9e910a91b88d450951c849d12598645562acc4b2 ("MIPS: eXcite: Remove
platform") from the mips tree and commit
8fead79c96c68164372c47c7b3c79d2da0871c93 ("mtd: move excite_nand_remove
to .devexit.text") from the mtd tree.
The former just removed the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists