]> 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, 29 Nov 2011 01:15:31 +0000 (12:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 01:15:31 +0000 (12:15 +1100)
commitbffa587b2999d94a81a77dd142538f9ea2b5ccfc
tree250b97710cb870d03fd48b162610383e3f8480ec
parentf925dabc0242db1bf5eac3942071581168e315a0
parent02f88be9488a3d831f073c1161b1e5feacb9d3ec
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