Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

* 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
  spi/amba_pl022: Fix probe and remove hook section annotations.
  spi/mpc5121: change annotations for probe and remove functions
  spi/bitbang: reinitialize transfer parameters for every message
  spi/spi-gpio: add support for controllers without MISO or MOSI pin
  spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes
  SPI100k: Fix 8-bit and RX-only transfers
  spi/mmc_spi: mmc_spi adaptations for SPI bus locking API
  spi/mmc_spi: SPI bus locking API, using mutex

Fix trivial conflict in drivers/spi/mpc512x_psc_spi.c due to 'struct
of_device' => 'struct platform_device' rename and __init/__exit to
__devinit/__devexit fix.

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

diff --cc drivers/spi/mpc512x_psc_spi.c
index cddbfce,c8d69fc..77d9e7e
--- 1/drivers/spi/mpc512x_psc_spi.c
--- 2/drivers/spi/mpc512x_psc_spi.c
+++ b/drivers/spi/mpc512x_psc_spi.c
@@@ -507,8 -505,8 +507,8 @@@ static int __devexit mpc512x_psc_spi_do
        return 0;
  }
  
- static int __init mpc512x_psc_spi_of_probe(struct platform_device *op,
-                                          const struct of_device_id *match)
 -static int __devinit mpc512x_psc_spi_of_probe(struct of_device *op,
++static int __devinit mpc512x_psc_spi_of_probe(struct platform_device *op,
+                                             const struct of_device_id *match)
  {
        const u32 *regaddr_p;
        u64 regaddr64, size64;
@@@ -539,7 -537,7 +539,7 @@@
                                irq_of_parse_and_map(op->dev.of_node, 0), id);
  }
  
- static int __exit mpc512x_psc_spi_of_remove(struct platform_device *op)
 -static int __devexit mpc512x_psc_spi_of_remove(struct of_device *op)
++static int __devexit mpc512x_psc_spi_of_remove(struct platform_device *op)
  {
        return mpc512x_psc_spi_do_remove(&op->dev);
  }

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