From: Arnd Bergmann Date: Sat, 21 Jul 2012 21:12:15 +0000 (+0200) Subject: Merge branch 'next/devel-samsung-spi' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=85644d2a8893d72d1869c6347e791902dd414288;p=linux-beck.git Merge branch 'next/devel-samsung-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/spi From Kukjin Kim : You may think that 'since this is including only samsung spi stuff, so this should be sent to upstream via spi tree', yeah right. But in this time, would be helpful to us if they could be sent via arm-soc, samsung tree for avoiding useless conflicts. Because samsung-dt-spi branch touches the same driver and it is already in arm-soc tree. * 'next/devel-samsung-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: 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() Signed-off-by: Arnd Bergmann --- 85644d2a8893d72d1869c6347e791902dd414288