]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'spi' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Jul 2012 23:20:43 +0000 (16:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Jul 2012 23:20:43 +0000 (16:20 -0700)
commit2fa379474fe2227d4d691d2d24eab4e3bdb3b26b
tree6d91e77cf398f992dc67bdd3be74b985640b1a42
parent4f2d658b2f09c41677871a4285a09cf35f954dad
parent85644d2a8893d72d1869c6347e791902dd414288
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()