iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/arm
History
Javier Martin 6bd081277e dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c 
It is mainly a simple merge changing the prefix of some
functions to fit the imx-dma namings.

As there are no users of the old dma-v1.c api we can safely
remove this file.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
2012-03-26 11:31:29 +05:30
..
boot
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2012-01-16 14:34:54 -08:00
common
DMA: PL330: Merge PL330 driver into drivers/dma/
2012-03-08 17:59:28 +05:30
configs
SH/R-Mobile updates for 3.3 merge window.
2012-01-11 23:29:20 -08:00
include/asm
Merge branch 'rmk_cookie_fixes2' into next
2012-03-13 12:39:49 +05:30
kernel
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit
2012-01-17 16:41:31 -08:00
lib
ARM: lib: add call_with_stack function for safely changing stack
2011-12-12 16:07:35 +00:00
mach-at91
dmaengine: at_hdmac: add slave config operation
2012-03-21 21:12:29 +05:30
mach-bcmring
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
mach-clps711x
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-cns3xxx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-davinci
MTD pull for 3.3
2012-01-10 13:45:22 -08:00
mach-dove
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-ebsa110
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-ep93xx
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
mach-exynos
Merge branch 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
2012-01-16 22:46:19 -08:00
mach-footbridge
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-gemini
ARM: big removal of now unused vmalloc.h files
2011-11-26 19:21:29 -05:00
mach-h720x
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-highbank
Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes
2012-01-16 22:46:06 -08:00
mach-imx
dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c
2012-03-26 11:31:29 +05:30
mach-integrator
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-iop13xx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-iop32x
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-iop33x
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-ixp4xx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-ixp23xx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-ixp2000
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-kirkwood
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-ks8695
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-l7200/include/mach
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
mach-lpc32xx
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
mach-mmp
Merge branch 'samsung/driver' into next/drivers
2012-01-09 16:16:29 +00:00
mach-msm
Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes
2012-01-16 22:46:06 -08:00
mach-mv78xx0
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-mx5
power management changes for omap and imx
2012-01-09 14:39:59 -08:00
mach-mxs
clock management changes for i.MX
2012-01-09 14:44:15 -08:00
mach-netx
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-nomadik
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-omap1
New feature development
2012-01-09 14:38:51 -08:00
mach-omap2
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2012-01-16 17:47:27 -08:00
mach-orion5x
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-picoxcell
Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji into fixes
2012-01-16 22:45:42 -08:00
mach-pnx4008
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-prima2
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-pxa
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2012-01-12 08:00:30 -08:00
mach-realview
Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes
2012-01-16 22:46:06 -08:00
mach-rpc
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-s3c64xx
Merge branch 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
2012-01-16 22:46:19 -08:00
mach-s3c2410
Device tree conversions for samsung and tegra
2012-01-09 14:28:38 -08:00
mach-s3c2412
Device tree conversions for samsung and tegra
2012-01-09 14:28:38 -08:00
mach-s3c2416
Cleanups for the Samsung platforms
2012-01-09 14:30:28 -08:00
mach-s3c2440
Board-level changes
2012-01-09 14:37:41 -08:00
mach-s3c2443
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
mach-s5p64x0
Driver specific changes
2012-01-09 14:39:22 -08:00
mach-s5pc100
Cleanups for the Samsung platforms
2012-01-09 14:30:28 -08:00
mach-s5pv210
Cleanups for the Samsung platforms
2012-01-09 14:30:28 -08:00
mach-sa1100
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm
2012-01-16 15:34:44 -08:00
mach-shark
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-shmobile
ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only
2012-02-01 22:23:54 +05:30
mach-spear3xx
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-spear6xx
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-tegra
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2012-01-12 08:00:30 -08:00
mach-u300
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
2012-01-10 10:19:57 -08:00
mach-ux500
Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes
2012-01-16 22:46:06 -08:00
mach-versatile
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-vexpress
Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes
2012-01-16 22:46:06 -08:00
mach-vt8500
ARM: big removal of now unused vmalloc.h files
2011-11-26 19:21:29 -05:00
mach-w90x900
Merge branch 'master' into fixes
2012-01-13 15:00:22 +00:00
mach-zynq
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mm
ARM: Add arm_memblock_steal() to allocate memory away from the kernel
2012-01-13 15:02:35 +00:00
nwfpe
ARM: 7207/1: Use generic ARM instruction set condition code checks for nwfpe.
2011-12-13 08:52:02 +00:00
oprofile
oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue
2011-12-23 11:58:34 +01:00
plat-iop
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
plat-mxc
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
plat-nomadik
dmaengine/dma_slave: introduce inline wrappers
2012-03-21 19:20:22 +05:30
plat-omap
ARM: Add arm_memblock_steal() to allocate memory away from the kernel
2012-01-13 15:02:35 +00:00
plat-orion
New feature development
2012-01-09 14:38:51 -08:00
plat-pxa
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
2011-11-23 20:47:41 +00:00
plat-s3c24xx
Merge branch 'master' into fixes
2012-01-13 15:00:22 +00:00
plat-s5p
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
plat-samsung
dmaengine/dma_slave: introduce inline wrappers
2012-03-21 19:20:22 +05:30
plat-spear
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
plat-versatile
Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes
2012-01-16 22:46:06 -08:00
tools
ARM: Update mach-types
2011-12-23 22:58:10 +00:00
vfp
arm: remove several unnecessary module.h include instances
2011-10-31 19:30:48 -04:00
Kconfig
lib: use generic pci_iomap on all architectures
2012-01-10 18:04:27 -08:00
Kconfig-nommu
…
Kconfig.debug
Merge branches 'at91/gpio', 'at91/ioremap', 'drivers/macb-gem-cleanup' and 'msm/misc' into next/cleanup
2011-12-01 12:34:21 +00:00
Makefile
arm: Remove TCC subarch from Kconfig/Makefile
2012-01-05 13:33:59 +01:00