Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
commitf8451c3f15982ebdf71f7b5e155ade38efc5993f
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2011 16:52:56 +0000 (4 09:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2011 16:52:56 +0000 (4 09:52 -0700)
tree7d0437ef000896413ca5161a4c956baec2474d75
parent5f39e6705faade2e89d119958a8c51b9b6e2c53c
parentf3e03e2eb0bcd9266720695b82a523e6bc526ff7
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