diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 16:20:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 16:20:43 -0700 |
| commit | 2fa379474fe2227d4d691d2d24eab4e3bdb3b26b (patch) | |
| tree | 6d91e77cf398f992dc67bdd3be74b985640b1a42 /arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | |
| parent | Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| parent | Merge branch 'next/devel-samsung-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/spi (diff) | |
| download | linux-dev-2fa379474fe2227d4d691d2d24eab4e3bdb3b26b.tar.xz linux-dev-2fa379474fe2227d4d691d2d24eab4e3bdb3b26b.zip | |
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()
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c')
0 files changed, 0 insertions, 0 deletions