From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 Jul 2012 23:20:43 +0000 (-0700)
Subject: Merge tag 'spi' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: next-20120725~134
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2fa379474fe2227d4d691d2d24eab4e3bdb3b26b;p=karo-tx-linux.git

Merge tag 'spi' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc spi updates from Arnd Bergmann:
 "These changes conceptually belong into the spi tree, but we decided to
  put them into arm-soc to better deal with interdependencies with other
  platform specific patches that are already there."

* tag 'spi' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  spi/s3c64xx: Expand S3C64XX_SPI_{DE,}ACT macros at call sites
  spi/s3c64xx: Convert to devm_request_and_ioremap()
  spi/s3c64xx: Put the /CS GPIO into output mode
  spi/s3c64xx: Fix handling of errors in gpio_request()
---

2fa379474fe2227d4d691d2d24eab4e3bdb3b26b