Merge remote-tracking branch 'spi/for-next'

diff --cc drivers/input/misc/ad714x-spi.c
Simple merge

diff --cc drivers/input/touchscreen/ads7846.c
Simple merge

diff --cc drivers/input/touchscreen/tsc2005.c
index 1bbe64c89a10e6cfcc845bb472fed785acebab7d,f41f23318484d1fb97a427b38e28f15c6e585f57..b9f593dfd2ef8368223e5d7d7d9ca06856afcc8d
--- 1/drivers/input/touchscreen/tsc2005.c
--- 2/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@@ -75,8 -750,9 +75,7 @@@ static int tsc2005_remove(struct spi_de
  static struct spi_driver tsc2005_driver = {
        .driver = {
                .name   = "tsc2005",
-               .owner  = THIS_MODULE,
 -              .pm     = &tsc2005_pm_ops,
 +              .pm     = &tsc200x_pm_ops,
        },
        .probe  = tsc2005_probe,
        .remove = tsc2005_remove,

diff --cc drivers/media/i2c/s5c73m3/s5c73m3-spi.c
Simple merge

diff --cc drivers/mfd/arizona-spi.c
Simple merge

diff --cc drivers/mfd/da9052-spi.c
Simple merge

diff --cc drivers/mmc/host/mmc_spi.c
Simple merge

diff --cc drivers/mtd/devices/m25p80.c
Simple merge

diff --cc drivers/mtd/devices/mtd_dataflash.c
Simple merge

diff --cc drivers/mtd/devices/sst25l.c
Simple merge

diff --cc drivers/net/ieee802154/at86rf230.c
Simple merge

diff --cc drivers/net/ieee802154/mrf24j40.c
index aca0fb3cccbf5f294e689daae6722638356badab,e4c37d48add16a40c67c8cc36e7288054b7efa85..4cdf51638972095644204eebccf46c8c77421ef2
--- 1/drivers/net/ieee802154/mrf24j40.c
--- 2/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@@ -1380,9 -811,7 +1380,8 @@@ MODULE_DEVICE_TABLE(spi, mrf24j40_ids)
  
  static struct spi_driver mrf24j40_driver = {
        .driver = {
 +              .of_match_table = of_match_ptr(mrf24j40_of_match),
                .name = "mrf24j40",
-               .owner = THIS_MODULE,
        },
        .id_table = mrf24j40_ids,
        .probe = mrf24j40_probe,

diff --cc drivers/nfc/st-nci/spi.c
Simple merge

diff --cc drivers/nfc/trf7970a.c
index 123aa981c9d87844932b769cd3949ef6a1416a4c,4036788c78b6edda97d00e83240b77d82958d8c2..f857feb2b573e7bb98e008f44527ed762d82b7a8
--- 1/drivers/nfc/trf7970a.c
--- 2/drivers/nfc/trf7970a.c
+++ b/drivers/nfc/trf7970a.c
@@@ -2229,8 -2223,6 +2229,7 @@@ static struct spi_driver trf7970a_spi_d
        .id_table       = trf7970a_id_table,
        .driver         = {
                .name   = "trf7970a",
-               .owner  = THIS_MODULE,
 +              .of_match_table = of_match_ptr(trf7970a_of_match),
                .pm     = &trf7970a_pm_ops,
        },
  };

diff --cc drivers/staging/mt29f_spinand/mt29f_spinand.c
Simple merge

diff --cc sound/soc/codecs/ad193x-spi.c
Simple merge

diff --cc sound/soc/codecs/wm8731.c
Simple merge