linux/arch/arm
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
..
boot Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2013-07-05 12:12:33 -07:00
common 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
configs ARM SoC driver specific changes 2013-07-02 14:33:21 -07:00
crypto
include 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
kernel 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
kvm KVM fixes for 3.11 2013-07-03 13:21:40 -07:00
lib
mach-at91 ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-bcm
mach-bcm2835
mach-clps711x ARM: clps711x: Add support for SYSCON driver 2013-06-11 15:47:45 -07:00
mach-cns3xxx
mach-davinci 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
mach-dove ARM: dove: move DT boards to SoC-centric clock init 2013-05-29 19:21:05 +00:00
mach-ebsa110
mach-ep93xx
mach-exynos Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-07-03 09:46:29 -07:00
mach-footbridge
mach-gemini
mach-highbank
mach-imx 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
mach-integrator 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
mach-iop13xx drivers/dma: remove unused support for MEMSET operations 2013-07-03 16:07:42 -07:00
mach-iop32x
mach-iop33x
mach-ixp4xx 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
mach-keystone ARM: keystone: Move CPU bringup code to dedicated asm file 2013-06-24 16:23:36 +02:00
mach-kirkwood ARM SoC board specific changes 2013-07-02 14:10:26 -07:00
mach-ks8695
mach-lpc32xx dmaengine: PL08x: Avoid collisions with get_signal() macro 2013-07-05 11:40:47 +05:30
mach-mmp 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
mach-msm 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
mach-mv78xx0
mach-mvebu mvebu register map changes for v3.11 (round 2) 2013-06-21 20:00:08 +02:00
mach-mxs ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-netx
mach-nomadik ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mach-nspire arm: Add Initial TI-Nspire support 2013-06-21 20:06:30 +02:00
mach-omap1 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
mach-omap2 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
mach-orion5x
mach-picoxcell ARM SoC specific changes 2013-07-02 13:43:38 -07:00
mach-prima2 ARM SoC cleanups 2013-07-02 13:25:35 -07:00
mach-pxa 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
mach-realview
mach-rockchip arm: add basic support for Rockchip RK3066a boards 2013-06-21 09:21:02 +02:00
mach-rpc
mach-s3c24xx Power management and ACPI updates for 3.11-rc1 2013-07-03 14:35:40 -07:00
mach-s3c64xx ARM: SAMSUNG: Let platforms use the new watchdog reset driver 2013-06-19 03:13:16 +09:00
mach-s5p64x0 ARM: s5p64x0: avoid build warning for uncompress.h 2013-06-20 17:31:50 +02:00
mach-s5pc100 ARM: SAMSUNG: Let platforms use the new watchdog reset driver 2013-06-19 03:13:16 +09:00
mach-s5pv210 ARM: SAMSUNG: Consolidate uncompress subroutine 2013-06-19 02:22:18 +09:00
mach-sa1100 sched_clock: Make ARM's sched_clock generic for all architectures 2013-06-12 14:02:13 -07:00
mach-shark
mach-shmobile Power management and ACPI updates for 3.11-rc1 2013-07-03 14:35:40 -07:00
mach-socfpga Adds basic support for Rockchip Cortex-A9 SoCs. 2013-06-21 11:46:56 +02:00
mach-spear Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma 2013-07-07 11:11:43 -07:00
mach-sti ARM: sti: Add STiH416 SOC support 2013-06-25 13:26:58 -07:00
mach-sunxi ARM SoC specific changes 2013-07-02 13:43:38 -07:00
mach-tegra Power management and ACPI updates for 3.11-rc1 2013-07-03 14:35:40 -07:00
mach-u300 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
mach-ux500 The common clock framework changes for 3.11 include new clock drivers 2013-07-03 11:54:50 -07:00
mach-versatile
mach-vexpress ARM SoC specific changes 2013-07-02 13:43:38 -07:00
mach-virt Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-07-03 09:46:29 -07:00
mach-vt8500 Cleanups in various machine definitions 2013-05-31 22:08:11 -07:00
mach-w90x900
mach-zynq ARM SoC device tree changes 2013-07-02 14:23:01 -07:00
mm Merge branch 'for-v3.11' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2013-07-06 12:41:54 -07:00
net
nwfpe
oprofile
plat-iop 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
plat-omap 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
plat-orion 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
plat-pxa
plat-samsung 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
plat-versatile 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
tools
vfp
xen xen/arm and xen/arm64: implement HYPERVISOR_tmem_op 2013-07-04 11:41:12 +00:00
Kconfig 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
Kconfig-nommu ARM: mpu: Ensure that MPU depends on CPU_V7 2013-06-17 15:13:18 +01:00
Kconfig.debug Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-07-03 09:46:29 -07:00
Makefile Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-07-03 09:46:29 -07:00