]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 01:20:41 +0000 (12:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 01:20:41 +0000 (12:20 +1100)
commitdcb315b3e836a1834b3fa8aab657296233ba352d
treecbe9dd2b1fa3fb60d91f78c6c5ac4e9f8a0dc30d
parent893dc0218ab1eaccaf8ab541389a531741c7fba7
parent3506c0d507144d9b0f19efd5a56d289f70611179
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/Kconfig
drivers/dma/pl330.c
12 files changed:
MAINTAINERS
arch/arm/plat-samsung/dma-ops.c
arch/arm/plat-samsung/include/plat/dma-ops.h
drivers/dma/pl330.c
drivers/misc/carma/carma-fpga-program.c
drivers/mmc/host/mxcmmc.c
drivers/mmc/host/sh_mmcif.c
drivers/spi/spi-pl022.c
drivers/tty/serial/pch_uart.c
drivers/tty/serial/sh-sci.c
drivers/usb/renesas_usbhs/fifo.c
sound/atmel/ac97c.c