Merge remote-tracking branch 'staging/staging-next'

Conflicts:
	drivers/hid/hid-hyperv.c
	drivers/staging/hv/Kconfig
	drivers/staging/hv/Makefile
	drivers/staging/iio/adc/ad799x_core.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/Makefile
Simple merge

diff --cc drivers/staging/cxt1e1/libsbew.h
Simple merge

diff --cc drivers/staging/frontier/tranzport.c
Simple merge

diff --cc drivers/staging/iio/accel/adis16201_core.c
Simple merge

diff --cc drivers/staging/iio/accel/adis16203_core.c
Simple merge

diff --cc drivers/staging/iio/accel/adis16204_core.c
Simple merge

diff --cc drivers/staging/iio/accel/adis16209_core.c
Simple merge

diff --cc drivers/staging/iio/accel/adis16220_core.c
Simple merge

diff --cc drivers/staging/iio/accel/adis16240_core.c
Simple merge

diff --cc drivers/staging/iio/accel/kxsd9.c
Simple merge

diff --cc drivers/staging/iio/accel/lis3l02dq_core.c
Simple merge

diff --cc drivers/staging/iio/accel/sca3000_core.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7192.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7280a.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7291.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7298_core.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7476_core.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7606_spi.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7780.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7793.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7816.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7887_core.c
Simple merge

diff --cc drivers/staging/iio/adc/ad799x_core.c
index c0d2f886ea2c23dcf7e2b11bb341750f54392394,815e6b9a8d4beab58b1037b26e8667785c0e0f16..d5b581d8bc2bf11a7c08d9b045e60825f6cfed8d
--- 1/drivers/staging/iio/adc/ad799x_core.c
--- 2/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@@ -934,4 -943,6 +934,3 @@@ module_i2c_driver(ad799x_driver)
  MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
  MODULE_DESCRIPTION("Analog Devices AD799x ADC");
  MODULE_LICENSE("GPL v2");
- MODULE_ALIAS("i2c:ad799x");
 -
 -module_init(ad799x_init);
 -module_exit(ad799x_exit);

diff --cc drivers/staging/iio/adc/adt7310.c
Simple merge

diff --cc drivers/staging/iio/adc/adt7410.c
Simple merge

diff --cc drivers/staging/iio/adc/max1363_core.c
Simple merge

diff --cc drivers/staging/iio/addac/adt7316-spi.c
Simple merge

diff --cc drivers/staging/iio/cdc/ad7150.c
Simple merge

diff --cc drivers/staging/iio/cdc/ad7152.c
Simple merge

diff --cc drivers/staging/iio/cdc/ad7746.c
Simple merge

diff --cc drivers/staging/iio/dac/ad5064.c
Simple merge

diff --cc drivers/staging/iio/dac/ad5360.c
Simple merge

diff --cc drivers/staging/iio/dac/ad5446.c
Simple merge

diff --cc drivers/staging/iio/dac/ad5504.c
Simple merge

diff --cc drivers/staging/iio/dac/ad5624r_spi.c
Simple merge

diff --cc drivers/staging/iio/dac/ad5686.c
Simple merge

diff --cc drivers/staging/iio/dac/ad5791.c
index 4a80fd8222311f0ac7791fb2446e9137a9876b68,e919025f138a62535648a33230b9ebfeb7374be7..ac45636a8d72e2dcf4c9e37a7b54b23922da5bed
--- 1/drivers/staging/iio/dac/ad5791.c
--- 2/drivers/staging/iio/dac/ad5791.c
+++ b/drivers/staging/iio/dac/ad5791.c
@@@ -410,8 -413,19 +413,8 @@@ static struct spi_driver ad5791_driver 
        .remove = __devexit_p(ad5791_remove),
        .id_table = ad5791_id,
  };
 -
 -static __init int ad5791_spi_init(void)
 -{
 -      return spi_register_driver(&ad5791_driver);
 -}
 -module_init(ad5791_spi_init);
 -
 -static __exit void ad5791_spi_exit(void)
 -{
 -      spi_unregister_driver(&ad5791_driver);
 -}
 -module_exit(ad5791_spi_exit);
 +module_spi_driver(ad5791_driver);
  
  MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
- MODULE_DESCRIPTION("Analog Devices AD5760/AD5780/AD5781/AD5791 DAC");
+ MODULE_DESCRIPTION("Analog Devices AD5760/AD5780/AD5781/AD5790/AD5791 DAC");
  MODULE_LICENSE("GPL v2");

diff --cc drivers/staging/iio/dds/ad5930.c
Simple merge

diff --cc drivers/staging/iio/dds/ad9832.c
Simple merge

diff --cc drivers/staging/iio/dds/ad9834.c
Simple merge

diff --cc drivers/staging/iio/dds/ad9850.c
Simple merge

diff --cc drivers/staging/iio/dds/ad9852.c
Simple merge

diff --cc drivers/staging/iio/dds/ad9910.c
Simple merge

diff --cc drivers/staging/iio/dds/ad9951.c
Simple merge

diff --cc drivers/staging/iio/gyro/adis16080_core.c
Simple merge

diff --cc drivers/staging/iio/gyro/adis16130_core.c
Simple merge

diff --cc drivers/staging/iio/gyro/adis16260_core.c
Simple merge

diff --cc drivers/staging/iio/gyro/adxrs450_core.c
Simple merge

diff --cc drivers/staging/iio/impedance-analyzer/ad5933.c
Simple merge

diff --cc drivers/staging/iio/imu/adis16400_core.c
Simple merge

diff --cc drivers/staging/iio/industrialio-trigger.c
Simple merge

diff --cc drivers/staging/iio/light/isl29018.c
Simple merge

diff --cc drivers/staging/iio/light/tsl2563.c
Simple merge

diff --cc drivers/staging/iio/light/tsl2583.c
Simple merge

diff --cc drivers/staging/iio/magnetometer/ak8975.c
Simple merge

diff --cc drivers/staging/iio/magnetometer/hmc5843.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7753.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7754.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7758_core.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7759.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7854-spi.c
Simple merge

diff --cc drivers/staging/iio/resolver/ad2s1200.c
Simple merge

diff --cc drivers/staging/iio/resolver/ad2s1210.c
Simple merge

diff --cc drivers/staging/iio/resolver/ad2s90.c
Simple merge

diff --cc drivers/staging/sep/sep_driver.c
Simple merge

diff --cc drivers/staging/vt6656/main_usb.c
Simple merge