ec1c00827d37129fe5
parent 0bc463426ab5eb39e76df637b29a4f191d01b8a0
author Linus Torvalds <torvalds@linux-foundation.org> 1293732464 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1293732464 -0800

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

* 'merge-spi' of git://git.secretlab.ca/git/linux-2.6:
  spi/m68knommu: Coldfire QSPI platform support
  spi/omap2_mcspi.c: Force CS to be in inactive state after off-mode transition
t¯®h˜,x