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

Conflicts:
	drivers/spi/spi-s3c64xx.c

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/spi/spi-s3c64xx.c
index 51a8c4216ebbc82136c59f3e4cedd7e87213a3a4,8f492ed317cc3ca8ac2b6298686c7c2f5e341b54..7cfbe9d3381f7d00b08bc74017c38ae7c0fc6d67
--- 1/drivers/spi/spi-s3c64xx.c
--- 2/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@@ -1150,10 -1191,9 +1146,10 @@@ static inline struct s3c64xx_spi_port_c
                         platform_get_device_id(pdev)->driver_data;
  }
  
- static int __init s3c64xx_spi_probe(struct platform_device *pdev)
+ static int s3c64xx_spi_probe(struct platform_device *pdev)
  {
        struct resource *mem_res;
 +      struct resource *res;
        struct s3c64xx_spi_driver_data *sdd;
        struct s3c64xx_spi_info *sci = pdev->dev.platform_data;
        struct spi_master *master;

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