From: Linus Torvalds Date: Tue, 4 Oct 2011 16:52:56 +0000 (-0700) Subject: Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f8451c3f15982ebdf71f7b5e155ade38efc5993f;p=~shefty%2Frdma-dev.git 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-topcliff-pch: Fix overrun issue spi-topcliff-pch: Add recovery processing in case FIFO overrun error occurs spi-topcliff-pch: Fix CPU read complete condition issue spi-topcliff-pch: Fix SSN Control issue spi-topcliff-pch: add tx-memory clear after complete transmitting --- f8451c3f15982ebdf71f7b5e155ade38efc5993f