tree 7d0437ef000896413ca5161a4c956baec2474d75
parent 5f39e6705faade2e89d119958a8c51b9b6e2c53c
parent f3e03e2eb0bcd9266720695b82a523e6bc526ff7
author Linus Torvalds <torvalds@linux-foundation.org> 1317747176 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1317747176 -0700

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