From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Dec 2011 04:48:05 +0000 (+1100)
Subject: Merge remote-tracking branch 'staging/staging-next'
X-Git-Tag: next-20111207~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=49360e4349a1293fbdc86125cf163c6da5e3a55a;p=karo-tx-linux.git

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
	drivers/staging/iio/industrialio-core.c
---

49360e4349a1293fbdc86125cf163c6da5e3a55a
diff --cc drivers/staging/iio/adc/ad799x_core.c
index c0d2f886ea2c,5bedb19cc72b..113f5eaf2eb2
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@@ -934,4 -944,6 +935,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);