Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx...
authorNeilBrown <neilb@suse.de>
Wed, 23 Sep 2009 08:31:11 +0000 (18:31 +1000)
committerNeilBrown <neilb@suse.de>
Wed, 23 Sep 2009 08:31:11 +0000 (18:31 +1000)
commit4b3df5668c8ebaebd8d66a5a94374be3e3b2ef0c
tree51a231742e211143f5845edf4b09d1712dcd2771
parent1ef04fefe2241087d9db7e9615c3f11b516e36cf
parent1f6672d44c1ae7408b43c06170ec34eb0a0e9b9f
Merge branch 'next' of git://git./linux/kernel/git/djbw/async_tx into for-linus
arch/sh/drivers/dma/Kconfig
arch/sh/include/asm/dma-sh.h
drivers/dma/at_hdmac.c
drivers/dma/dw_dmac.c
drivers/dma/txx9dmac.c
drivers/md/raid5.c
include/linux/pci_ids.h