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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-omap1/board-nokia770.c between commit
ab6f7751905e5cf713d081dbb3b97b8f6909ab34 ("Removing dead OMAP_DSP") from
Linus' tree and commit 426d31071ac476ea62c62656b242930c17b58c00 ("fix
printk typo 'faild'") from the trivial tree.

The former removes the code that the latter is updating.  So I just
removed it.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgpYikkgBvlcf.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux