]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 03:33:44 +0000 (14:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 03:33:44 +0000 (14:33 +1100)
commit2d4632418186613e235fa1fa49972d8a610eba2f
tree97195b756f5a82e9244855193e23b65eaae9319d
parent79fc6f645a732c61b8e766ac5fd3d739f262d56b
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