]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 01:12:37 +0000 (12:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 01:12:37 +0000 (12:12 +1100)
commit94a97e5379bfe7112521ac3988f7674cb263af7f
tree518a938c5b37250c56712d4b72344181af0d44f8
parent497fe41e864caebf31fd0e49cc17c21974ef71a8
parent3506c0d507144d9b0f19efd5a56d289f70611179
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
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