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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/ni_labpc.c between commit c19cc78efe92
("staging: fix comedi build when ISA_DMA_API is enabled but COMEDI_PCI is
not enabled") from Linus' tree and commit d6aa8366dde1 ("staging: fix
comedi build errors") from the staging tree.

I have used the version from Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature