summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-23 16:11:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-23 16:11:56 -0700
commite66d637134b7045ea6f14bdd416cd3695f73ed42 (patch)
tree09186dbf65d236179f9a2616d0be7a25154f8822 /drivers/tty
parent5e512d0785e67d9ff41ee4af39bb71fc6161d5c9 (diff)
parent31dfec74c0dc49521b2e17543ff9dd9dd0221702 (diff)
downloadlinux-e66d637134b7045ea6f14bdd416cd3695f73ed42.tar.gz
linux-e66d637134b7045ea6f14bdd416cd3695f73ed42.tar.bz2
linux-e66d637134b7045ea6f14bdd416cd3695f73ed42.zip
Merge tag 'dma' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull samsung arm-soc dma changes from Arnd Bergmann: "Some platforms are not yet converted to use the dmaengine framework, including some of the samsung SoCs. In the meantime, we treat this as platform code and merge the patches through the arm-soc tree." * tag 'dma' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: SAMSUNG: Fix compiler warning in dma-ops.c file ASoC: follow the updated samsung DMA common operations spi/s3c64xx: Add the use of DMA config operation ARM: SAMSUNG: Add config() function in DMA common operations
Diffstat (limited to 'drivers/tty')
0 files changed, 0 insertions, 0 deletions