From: Grant Likely <grant.likely@secretlab.ca>
Date: Wed, 29 Dec 2010 08:05:14 +0000 (-0700)
Subject: Merge branch 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next
X-Git-Tag: v2.6.38-rc1~454^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=94a544a4e8d05a027613443c529c399c39cc3371;p=linux.git

Merge branch 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next

* 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next
  spi/pxa2xx: register driver properly
  spi/pxa2xx: add support for shared IRQ handler
  spi/pxa2xx: Use define for SSSR_TFL_MASK instead of plain numbers
  arm/pxa2xx: reorgazine SSP and SPI header files
  spi/pxa2xx: Add CE4100 support
  spi/pxa2xx: Consider CE4100's FIFO depth
  spi/pxa2xx: Add chipselect support for Sodaville
  spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
  spi/pxa2xx: pass of_node to spi device and set a parent device
---

94a544a4e8d05a027613443c529c399c39cc3371