From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Oct 2012 18:13:54 +0000 (-0700)
Subject: Merge tag 'spi-mxs' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc
X-Git-Tag: v3.7~170
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e99165a6fe788aec8cd64596b71cf21db3af047;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'spi-mxs' of git://git./linux/kernel/git/broonie/misc

Pull minor spi MXS fixes from Mark Brown:
 "These fixes are both pretty minor ones and are driver local."

* tag 'spi-mxs' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc:
  spi: mxs: Terminate DMA in case of DMA timeout
  spi: mxs: Assign message status after transfer finished
---

8e99165a6fe788aec8cd64596b71cf21db3af047