]> 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, 19 Dec 2011 02:37:22 +0000 (13:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 02:37:22 +0000 (13:37 +1100)
commitb9c9c43525ed830647457f3cfc74c288bdda8dc0
treec4a5577bcea85c09a9a7ea4e6998c5d5a43aa577
parent9112c8072740ef881276632f43c1ef8dd4776bf8
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/mmc/host/mxcmmc.c
drivers/mmc/host/sh_mmcif.c
drivers/spi/spi-pl022.c
drivers/tty/serial/pch_uart.c
drivers/tty/serial/sh-sci.c
drivers/usb/renesas_usbhs/fifo.c