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: spi_txx9.c: use resource_size()
  spi: spi_sh_sci.c: use resource_size()
  spi: spi_mpc8xxx.c: use resource_size()
  spi: spi_bfin5xx.c: use resource_size()
  spi: atmel_spi.c: use resource_size()
  spi: Add s3c64xx SPI Controller driver
  atmel_spi: fix dma addr calculation for len > BUFFER_SIZE
  spi_s3c24xx: add FIQ pseudo-DMA support
  spi: controller driver for Designware SPI core
  spidev: add proper section markers
  spidev: use DECLARE_BITMAP instead of declaring the array

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi_mpc8xxx.c
index e9390d7,797226c..1fb2a6e
--- 1/drivers/spi/spi_mpc8xxx.c
--- 2/drivers/spi/spi_mpc8xxx.c
+++ b/drivers/spi/spi_mpc8xxx.c
@@@ -1013,10 -566,10 +1013,10 @@@ mpc8xxx_spi_probe(struct device *dev, s
  
        init_completion(&mpc8xxx_spi->done);
  
-       mpc8xxx_spi->base = ioremap(mem->start, mem->end - mem->start + 1);
+       mpc8xxx_spi->base = ioremap(mem->start, resource_size(mem));
        if (mpc8xxx_spi->base == NULL) {
                ret = -ENOMEM;
 -              goto put_master;
 +              goto err_ioremap;
        }
  
        mpc8xxx_spi->irq = irq;

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

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

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