Merge remote-tracking branch 'spi/topic/pdata' into spi-next

diff --cc drivers/spi/spi-davinci.c
Simple merge

diff --cc drivers/spi/spi-omap-100k.c
index 9137fcc4f99b4fe46c112fbccdfefcefefdd60ab,9236764861a9c31aae95bfbbec7e29cc7994c708..ee25670f8cfd127341fff7ddc16562a7e512507d
--- 1/drivers/spi/spi-omap-100k.c
--- 2/drivers/spi/spi-omap-100k.c
+++ b/drivers/spi/spi-omap-100k.c
@@@ -500,9 -509,8 +500,9 @@@ static int omap1_spi100k_probe(struct p
        master->cleanup = NULL;
        master->num_chipselect = 2;
        master->mode_bits = MODEBITS;
 +      master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
  
-       dev_set_drvdata(&pdev->dev, master);
+       platform_set_drvdata(pdev, master);
  
        spi100k = spi_master_get_devdata(master);
        spi100k->master = master;

diff --cc drivers/spi/spi-omap2-mcspi.c
Simple merge

diff --cc drivers/spi/spi-ppc4xx.c
Simple merge

diff --cc drivers/spi/spi-sh-hspi.c
Simple merge