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/iio/industrialio-core.c between commit aaa0b4f00729
("iio: iio_event_getfd -- fix ev_int build failure") from Linus' tree and
commit f791cec85073 ("Subject: fix build breakage in
drivers/staging/iio/industrialio-core.c") from the staging tree.

The former was a more extensive fix (and is upstream), so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature