Merge branch 'merge-spi' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Dec 2010 18:07:44 +0000 (10:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Dec 2010 18:07:44 +0000 (10:07 -0800)
commitff20f1779b7f60a9682aa8d62f8ca3b650e4c360
treedc4ad4ef1365009e1dbb09baf2238db74132022c
parentebb76ce16daf6908dc030dec1c00827d37129fe5
parent0bc463426ab5eb39e76df637b29a4f191d01b8a0
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