From: Linus Torvalds Date: Thu, 30 Dec 2010 18:07:44 +0000 (-0800) Subject: Merge branch 'merge-spi' of git://git.secretlab.ca/git/linux-2.6 X-Git-Url: https://git.karo-electronics.de/?p=mv-sheeva.git;a=commitdiff_plain;h=ff20f1779b7f60a9682aa8d62f8ca3b650e4c360 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 --- ff20f1779b7f60a9682aa8d62f8ca3b650e4c360