]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Nov 2011 01:48:17 +0000 (12:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Nov 2011 01:48:17 +0000 (12:48 +1100)
commited4c420f447d9d94a9c910f198b98231538f767b
tree8e831b664555850aebee14d8763ddea14a2392e9
parent7c4f54aa179b98be1fb5c143672c982a6d03d101
parente69664336d6400cc1685716ee5f04ef74e85703e
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