]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:51:21 +0000 (11:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:51:21 +0000 (11:51 +1100)
commit20b90d00e93e7ef20b3215e4d99f70e0a8f002f7
tree35899565136d83fcf20d4a3cb62f8dc53c670cfe
parent3a1c6e597f895048d75672d8793c5a021c30667d
parent3506c0d507144d9b0f19efd5a56d289f70611179
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/pl330.c
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/spi/spi-pl022.c
drivers/tty/serial/pch_uart.c
drivers/tty/serial/sh-sci.c
drivers/usb/renesas_usbhs/fifo.c