]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 02:11:02 +0000 (13:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 02:11:02 +0000 (13:11 +1100)
commit012d09f1e3240c19f91b472b771b67b0bc822016
tree3e4731f6d57b86c91ca9f06a856e31e0ad07b026
parent48640140591171f790dc1dc75a10b463ac04c9d0
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