tree 3a43151f8cc66ad84d043ce7e0e4a462240c6d85
parent 8ec9c7fb15fd8edf6b34555f5b498033121b2173
parent 387719c2ec995019e0af0dc537ca17c9ebd5b64f
author Linus Torvalds <torvalds@linux-foundation.org> 1316821996 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1316821996 -0700

Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
  spi: Fix WARN when removing spi-fsl-spi module
  spi/imx: Fix spi-imx when the hardware SPI chipselects are used