Thread (2 messages) 2 messages, 2 authors, 2011-06-17

linux-next: manual merge of the trivial tree with the slave-dma tree

From: Stephen Rothwell <hidden>
Date: 2011-06-17 02:54:31
Also in: lkml 

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-ep93xx/dma-m2p.c between commit 8e4a93008db7 ("ep93xx:
remove the old M2P DMA code") from the slave-dma tree and commit
1c5454eed85a ("Change Ryan Mallon's email address across the kernel")
from the trivial tree.

The former removed the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Attachments

  • (unnamed) [application/pgp-signature] 490 bytes
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help