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

From: Stephen Rothwell
Date: Thu Jun 16 2011 - 22:54:38 EST

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.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature