* linux-next: arm/mtd merge conflict
@ 2008-06-10 7:58 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2008-06-10 7:58 UTC (permalink / raw)
To: Russell King, David Woodhouse
Cc: linux-next, "Håvard Skinnemoen", Andrew Victor
[-- Attachment #1: Type: text/plain, Size: 619 bytes --]
Hi Russell, David,
Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-at91/board-yl-9200.c between commit
3c3796cc32b6e53653a5eb868dc959b8c2779db9 ("[MTD] [NAND] rename at91_nand
-> atmel_nand: internal symbols") from the mtd tree and commit
e3ba22db09408baee721897fb1b50e16f071d916 ("[ARM] 5056/1: [AT91] Cleanup
YL9200 board file") from the arm tree.
The former renames the struct type and the latter renames the instance.
I did the obvious fixup. It may be worth a look.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-06-10 7:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-06-10 7:58 linux-next: arm/mtd merge conflict Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).