]> 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, 25 Jul 2012 00:33:00 +0000 (10:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:33:00 +0000 (10:33 +1000)
commita89d7a70bcd30825a81f640ca350db918e5ab318
tree064dca7b5c314d5ce3a884d5c7238eb476aecf25
parentcce7c357a5907949ae80c1d616b65f3fb45cff19
parent634332502366554849fe37e88d05ec0a13e550c8
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/Kconfig
drivers/dma/Makefile
drivers/mmc/host/sh_mmcif.c
drivers/dma/Kconfig
drivers/dma/Makefile
drivers/dma/dw_dmac.c
drivers/mmc/host/sh_mmcif.c
drivers/mmc/host/sh_mobile_sdhi.c
drivers/tty/serial/sh-sci.c
drivers/usb/renesas_usbhs/fifo.c
include/linux/mmc/sh_mmcif.h
sound/soc/sh/fsi.c