]> 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, 21 Nov 2011 00:08:29 +0000 (11:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 21 Nov 2011 00:08:29 +0000 (11:08 +1100)
commit01a01f9db7dd061e6ec6ae587deb773d2864e3a0
tree90cf7f6bc582bf68315ed51ea5cd060e3f8d77b6
parente8e7773618b84ac40867bf603d9b0c636b53168c
parentca21a146a45a179a2a7bc86d938a2fbf571a7510
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