]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 02:14:36 +0000 (13:14 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 02:14:36 +0000 (13:14 +1100)
commitd1b248e9f46c78e6f9e4641a64de6681ae3e5276
treeedbe7fe2e8bd063c5c11899fdd7bf299bdd7716e
parentb8f34d9a0d92b6cfc0e44d16c69434b168a0f4d9
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