]> 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, 7 Dec 2011 01:05:14 +0000 (12:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 01:05:14 +0000 (12:05 +1100)
commit12c73c2e973cde58d8b3b718d9398b6627bc2e28
tree8e99ab163d7cbf6dd5381c2f54c343e713de1453
parent0729e4430803e61ff56800199ff56308cf00f398
parent5cd326fd27da347925019fcc041b79bad8dd55ed
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