diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:12:15 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:12:15 +0200 |
| commit | 85644d2a8893d72d1869c6347e791902dd414288 (patch) | |
| tree | 36cf6ecf6a3525dec0e0583f9961755c65fc2f6d /arch/arm/mach-omap2/prminst44xx.c | |
| parent | f9ed561ebd71f7a9a3238507ef9082862e2cbc9a (diff) | |
| parent | 5fc3e8311ccc87e9d9c9ce2aa36d0e5069e0807c (diff) | |
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 <kgene.kim@samsung.com>:
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 <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/prminst44xx.c')
0 files changed, 0 insertions, 0 deletions