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

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/iio/accel/adis16220_core.c between commit 7991029a55fa
("staging:iio:accel:adis16220 iio_chan_spec conversion") from the staging
tree and commit dcf6be043de1 ("staging: Add module.h to drivers/staging
users") from the moduleh tree.

Just context changes.  I have fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/staging/iio/accel/adis16220_core.c
index 075e40f,e119874..0000000
--- a/drivers/staging/iio/accel/adis16220_core.c
+++ b/drivers/staging/iio/accel/adis16220_core.c
@@@ -13,6 -16,8 +13,7 @@@
  #include <linux/spi/spi.h>
  #include <linux/slab.h>
  #include <linux/sysfs.h>
 -#include <linux/list.h>
+ #include <linux/module.h>
  
  #include "../iio.h"
  #include "../sysfs.h"
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/