From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 May 2010 19:04:17 +0000 (-0700)
Subject: Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v2.6.35-rc1~266
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=702c0b04978ce316ec05f4d0a9c148fac124335b;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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/xilinx: Fix compile error
  spi/davinci: Fix clock prescale factor computation
  spi: move bitbang txrx utility functions to private header
  spi/mpc5121: Add SPI master driver for MPC5121 PSC
  powerpc/mpc5121: move PSC FIFO memory init to platform code
  spi/ep93xx: implemented driver for Cirrus EP93xx SPI controller
  Documentation/spi/* compile warning fix
  spi/omap2_mcspi: Check params before dereference or use
  spi/omap2_mcspi: add turbo mode support
  spi/omap2_mcspi: change default DMA_MIN_BYTES value to 160
  spi/pl022: fix stop queue procedure
  spi/pl022: add support for the PL023 derivate
  spi/pl022: fix up differences between ARM and ST versions
  spi/spi_mpc8xxx: Do not use map_tx_dma to unmap rx_dma
  spi/spi_mpc8xxx: Fix QE mode Litte Endian
  spi/spi_mpc8xxx: fix potential memory corruption.
---

702c0b04978ce316ec05f4d0a9c148fac124335b