linux/arch
Linus Torvalds d2b4a64671 Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine updates from Vinod Koul:
 "Once you have some time from extended weekend celebrations please
  consider pulling the following to get:
   - Various fixes and PCI driver for dw_dmac by Andy
   - DT binding for imx-dma by Markus & imx-sdma by Shawn
   - DT fixes for dmaengine by Lars
   - jz4740 dmac driver by Lars
   - and various fixes across the drivers"

What "extended weekend celebrations"?  I'm in the merge window, who has
time for extended celebrations..

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (40 commits)
  DMA: shdma: add DT support
  DMA: shdma: shdma_chan_filter() has to be in shdma-base.h
  DMA: shdma: (cosmetic) don't re-calculate a pointer
  dmaengine: at_hdmac: prepare clk before calling enable
  dmaengine/trivial: at_hdmac: add curly brackets to if/else expressions
  dmaengine: at_hdmac: remove unsuded atc_cleanup_descriptors()
  dmaengine: at_hdmac: add FIFO configuration parameter to DMA DT binding
  ARM: at91: dt: add header to define at_hdmac configuration
  MIPS: jz4740: Correct clock gate bit for DMA controller
  MIPS: jz4740: Remove custom DMA API
  MIPS: jz4740: Register jz4740 DMA device
  dma: Add a jz4740 dmaengine driver
  MIPS: jz4740: Acquire and enable DMA controller clock
  dma: mmp_tdma: disable irq when disabling dma channel
  dmaengine: PL08x: Avoid collisions with get_signal() macro
  dmaengine: dw: select DW_DMAC_BIG_ENDIAN_IO automagically
  dma: dw: add PCI part of the driver
  dma: dw: split driver to library part and platform code
  dma: move dw_dmac driver to an own directory
  dw_dmac: don't check resource with devm_ioremap_resource
  ...
2013-07-07 11:11:43 -07:00
..
alpha mm/ALPHA: clean up unused VALID_PAGE() 2013-07-03 16:07:39 -07:00
arc Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 2013-07-04 14:02:09 -07:00
arm Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma 2013-07-07 11:11:43 -07:00
arm64 tmem hypercall for arm and arm64 2013-07-06 12:38:42 -07:00
avr32 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
blackfin Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
c6x Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
cris Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
frv Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2013-07-04 11:40:58 -07:00
h8300 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
hexagon mm/hexagon: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:36 -07:00
ia64 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
m32r Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
m68k Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
metag Metag architecture changes for v3.11 2013-07-06 12:39:39 -07:00
microblaze mm/microblaze: clean up unused VALID_PAGE() 2013-07-03 16:07:40 -07:00
mips Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma 2013-07-07 11:11:43 -07:00
mn10300 Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
openrisc Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
parisc Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
powerpc irqdomain refactoring for v3.11 2013-07-06 12:37:04 -07:00
s390 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2013-07-04 10:29:23 -07:00
score Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
sh mm/SH: prepare for killing free_all_bootmem_node() 2013-07-03 16:07:39 -07:00
sparc Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2013-07-04 10:29:23 -07:00
tile Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
um mm/um: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:37 -07:00
unicore32 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
x86 Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2013-07-06 14:09:38 -07:00
xtensa mm/xtensa: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:38 -07:00
.gitignore
Kconfig mm: soft-dirty bits for user memory changes tracking 2013-07-03 16:07:26 -07:00