]> 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, 22 Nov 2011 02:55:05 +0000 (13:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 02:55:05 +0000 (13:55 +1100)
commitcc1e446ca2e2b7ed1f65f65dbbc6b08d92bae81c
treef682927946518b0f0bf0807acc9680a429c83b67
parent82ce263a737f68afcac6105262b526b7071d633d
parentca21a146a45a179a2a7bc86d938a2fbf571a7510
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