linux-next: manual merge of the moduleh tree with the tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/dma/ste_dma40.c between commit f4b89764c470
("dmaengine/ste_dma40: use AMBA PrimeCell helper macros") from the
slave-dma tree and commit dbd9b79ce7bd ("Add export.h
to /home/paul/git/module.h/linux-2.6.git/drivers/dma/ste_dma40.c") from
the moduleh tree.

Just a trivla context change.  I fixed it up (just overlapping include
additions) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature