[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20091109144221.f27d7242.sfr@canb.auug.org.au>
Date: Mon, 9 Nov 2009 14:42:21 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Dominik Brodowski <linux@...inikbrodowski.net>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
David Woodhouse <David.Woodhouse@...el.com>
Subject: linux-next: manual merge of the pcmcia tree with the mtd tree
Hi Dominik,
Today's linux-next merge of the pcmcia tree got a conflict in
drivers/mtd/maps/pcmciamtd.c between commit
5da6bbe2f9e1db56b4a94cad2ace7d9992b1d666 ("pcmcia: convert pcmciamtd
driver to use new CIS helpers") from the mtd tree and commit
18b61b97294dad74dd00a1aa8efed0cfacb95aff ("pcmcia: convert pcmciamtd
driver to use new CIS helpers") from the pcmcia tree.
Presumably two different versions of the same change? I just used the
version from the pcmcia tree for today.
--
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