Merge tag 'spi-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jun 2013 06:17:11 +0000 (20:17 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jun 2013 06:17:11 +0000 (20:17 -1000)
commitf97f7d2d27bf092b40babda9ded29cc85cf77eec
treebd6b038bb85e6265c8aed04211687ac6f5b859e5
parentacdb37c361dc87e165889a504e291c1e82ae133c
parent332ec81d413bd4e7375c25d628e7f658c37138f6
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