]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 01:50:59 +0000 (12:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 01:50:59 +0000 (12:50 +1100)
commit3b6c1c3c5fea12cd997fc42cf611e59f46803f7a
tree4b01cd122511816d5286db64adecf7f88e5372d8
parentf4a92e5084a3661a70a06dffa1e1d334a15e53dd
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