Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
Linus Torvalds [Sat, 8 Jan 2011 01:08:46 +0000 (17:08 -0800)]
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
  spi/omap: Fix DMA API usage in OMAP MCSPI driver
  spi/imx: correct the test on platform_get_irq() return value
  spi/topcliff: Typo fix threhold to threshold
  spi/dw_spi Typo change diable to disable.
  spi/fsl_espi: change the read behaviour of the SPIRF
  spi/mpc52xx-psc-spi: move probe/remove to proper sections
  spi/dw_spi: add DMA support
  spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
  spi/dw_spi: Fix too short timeout in spi polling loop
  spi/pl022: convert running variable
  spi/pl022: convert busy flag to a bool
  spi/pl022: pass the returned sglen to the DMA engine
  spi/pl022: map the buffers on the DMA engine
  spi/topcliff_pch: Fix data transfer issue
  spi/imx: remove autodetection
  spi/pxa2xx: pass of_node to spi device and set a parent device
  spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
  spi/pxa2xx: Add chipselect support for Sodaville
  spi/pxa2xx: Consider CE4100's FIFO depth
  spi/pxa2xx: Add CE4100 support
  ...

16 files changed:
1  2 
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/devices.c
arch/arm/mach-pxa/em-x270.c
arch/arm/mach-pxa/hx4700.c
arch/arm/mach-pxa/icontrol.c
arch/arm/mach-pxa/littleton.c
arch/arm/mach-pxa/lubbock.c
arch/arm/mach-pxa/pcm027.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
arch/arm/mach-pxa/stargate2.c
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/trizeps4.c
arch/arm/mach-pxa/z2.c
arch/arm/mach-pxa/zeus.c
drivers/spi/omap2_mcspi.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #include <mach/mmc.h>
  #include <mach/ohci.h>
  #include <mach/pxafb.h>
- #include <mach/pxa2xx_spi.h>
  #include <mach/spitz.h>
  #include <mach/sharpsl_pm.h>
 +#include <mach/smemc.h>
  
  #include <plat/i2c.h>
  
  #include <plat/i2c.h>
  #include <mach/mmc.h>
  #include <mach/udc.h>
- #include <mach/pxa2xx_spi.h>
  #include <mach/pxa27x-udc.h>
 +#include <mach/smemc.h>
  
  #include <linux/spi/spi.h>
+ #include <linux/spi/pxa2xx_spi.h>
  #include <linux/mfd/da903x.h>
  #include <linux/sht15.h>
  
@@@ -44,9 -45,7 +45,8 @@@
  #include <mach/mmc.h>
  #include <mach/udc.h>
  #include <mach/tosa_bt.h>
- #include <mach/pxa2xx_spi.h>
  #include <mach/audio.h>
 +#include <mach/smemc.h>
  
  #include <asm/mach/arch.h>
  #include <mach/tosa.h>
Simple merge
Simple merge
Simple merge
Simple merge