]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 00:38:36 +0000 (11:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 00:38:36 +0000 (11:38 +1100)
commitb139f557ce825248f2bff886dc6d8e1093f9a7e2
tree9e1886c7da7b2b7a009ffb7574b678a8d296d7c2
parent1d6dff6187643f9aa56a9e4ae24b97cd8ca75de5
parent5cd326fd27da347925019fcc041b79bad8dd55ed
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