From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Jun 2013 06:17:11 +0000 (-1000)
Subject: Merge tag 'spi-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f97f7d2d27bf092b40babda9ded29cc85cf77eec;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'spi-v3.10-rc7' of git://git./linux/kernel/git/broonie/spi

Pull spi updates from Mark Brown:
 "A few last minute SPI updates: fix a missized allocation and use
  atomic allocations in atomic context in the PXA driver, and fix the
  checking of return codes in the S3C64xx driver which caused spurious
  errors under heavy load."

* tag 'spi-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi/pxa2xx: fix memory corruption due to wrong size used in devm_kzalloc()
  spi/pxa2xx: use GFP_ATOMIC in sg table allocation
  spi: s3c64xx: Fix pm_runtime_get_sync() return value check
---

f97f7d2d27bf092b40babda9ded29cc85cf77eec