Linus Torvalds
69f1d1a6ac
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
ARM: S5P64X0: External Interrupt Support
ARM: EXYNOS4: Enable MFC on Samsung NURI
ARM: EXYNOS4: Enable MFC on universal_c210
ARM: S5PV210: Enable MFC on Goni
ARM: S5P: Add support for MFC device
ARM: EXYNOS4: Add support FIMD on SMDKC210
ARM: EXYNOS4: Add platform device and helper functions for FIMD
ARM: EXYNOS4: Add resource definition for FIMD
ARM: EXYNOS4: Change devname for FIMD clkdev
ARM: SAMSUNG: Add IRQ_I2S0 definition
ARM: SAMSUNG: Add platform device for idma
ARM: EXYNOS4: Add more registers to be saved and restored for PM
ARM: EXYNOS4: Add more register addresses of CMU
ARM: EXYNOS4: Add platform device for dwmci driver
ARM: EXYNOS4: configure rtc-s3c on NURI
ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
ARM: EXYNOS4: configure ADC on NURI
ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
...
Fix up tons of silly conflicts:
- arch/arm/mach-davinci/include/mach/psc.h
- arch/arm/mach-exynos4/Kconfig
- arch/arm/mach-exynos4/mach-smdkc210.c
- arch/arm/mach-exynos4/pm.c
- arch/arm/mach-imx/mm-imx1.c
- arch/arm/mach-imx/mm-imx21.c
- arch/arm/mach-imx/mm-imx25.c
- arch/arm/mach-imx/mm-imx27.c
- arch/arm/mach-imx/mm-imx31.c
- arch/arm/mach-imx/mm-imx35.c
- arch/arm/mach-mx5/mm.c
- arch/arm/mach-s5pv210/mach-goni.c
- arch/arm/mm/Kconfig
|
2011-07-26 17:41:04 -07:00 |
| .. |
|
ioat
|
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
|
2011-05-28 12:35:15 -07:00 |
|
ipu
|
net: remove mm.h inclusion from netdevice.h
|
2011-06-21 19:17:20 -07:00 |
|
ppc4xx
|
Merge branch 'old_next' into next
|
2011-04-06 11:51:12 +05:30 |
|
amba-pl08x.c
|
ARM: amba: make probe() functions take const id tables
|
2011-02-23 16:24:14 +00:00 |
|
at_hdmac.c
|
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
|
2011-05-28 12:35:15 -07:00 |
|
at_hdmac_regs.h
|
dmaengine: at_hdmac: implement pause and resume in atc_control
|
2011-05-09 11:42:54 +05:30 |
|
coh901318.c
|
net: remove mm.h inclusion from netdevice.h
|
2011-06-21 19:17:20 -07:00 |
|
coh901318_lli.c
|
|
|
|
coh901318_lli.h
|
|
|
|
dmaengine.c
|
net: remove mm.h inclusion from netdevice.h
|
2011-06-21 19:17:20 -07:00 |
|
dmatest.c
|
net: remove mm.h inclusion from netdevice.h
|
2011-06-21 19:17:20 -07:00 |
|
dw_dmac.c
|
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
|
2011-05-28 12:35:15 -07:00 |
|
dw_dmac_regs.h
|
dmaengine/dw_dmac: Update maintainer-ship
|
2011-05-25 18:30:37 +05:30 |
|
ep93xx_dma.c
|
dmaengine: add ep93xx DMA support
|
2011-06-08 15:10:44 -06:00 |
|
fsldma.c
|
dt/fsldma: fix build warning caused by of_platform_device changes
|
2011-04-10 23:34:38 -07:00 |
|
fsldma.h
|
fsldma: fix controller lockups
|
2011-03-11 17:52:36 -08:00 |
|
imx-dma.c
|
ARM i.MX dma: Fix burstsize settings
|
2011-07-07 09:55:50 +02:00 |
|
imx-sdma.c
|
dmaengine: imx-sdma: pass sdma firmware name via platform data
|
2011-07-07 10:01:12 +02:00 |
|
intel_mid_dma.c
|
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
|
2011-05-28 12:35:15 -07:00 |
|
intel_mid_dma_regs.h
|
Fix common misspellings
|
2011-03-31 11:26:23 -03:00 |
|
iop-adma.c
|
dma: use BUG_ON correctly in iop-adma.c, v4
|
2011-03-31 11:07:40 +05:30 |
|
iovlock.c
|
|
|
|
Kconfig
|
dmaengine: add ep93xx DMA support
|
2011-06-08 15:10:44 -06:00 |
|
Makefile
|
dmaengine: add ep93xx DMA support
|
2011-06-08 15:10:44 -06:00 |
|
mpc512x_dma.c
|
Fix common misspellings
|
2011-03-31 11:26:23 -03:00 |
|
mv_xor.c
|
treewide: Convert uses of struct resource to resource_size(ptr)
|
2011-06-10 14:55:36 +02:00 |
|
mv_xor.h
|
|
|
|
mxs-dma.c
|
dmaengine: mxs-dma: add dma support for i.MX23/28
|
2011-03-02 07:06:27 +05:30 |
|
pch_dma.c
|
pch_dma: modify pci device table definition
|
2011-05-09 17:12:24 +05:30 |
|
pl330.c
|
ARM: amba: make probe() functions take const id tables
|
2011-02-23 16:24:14 +00:00 |
|
shdma.c
|
dmaengine: shdma: SH_DMAC_MAX_CHANNELS message fix
|
2011-06-14 15:03:07 +09:00 |
|
shdma.h
|
dmaengine: shdma: Update SH_DMAC_MAX_CHANNELS to 20
|
2011-05-25 11:36:17 +09:00 |
|
ste_dma40.c
|
net: remove mm.h inclusion from netdevice.h
|
2011-06-21 19:17:20 -07:00 |
|
ste_dma40_ll.c
|
dma40: cyclic xfer support
|
2011-01-30 22:27:21 -08:00 |
|
ste_dma40_ll.h
|
dma40: cyclic xfer support
|
2011-01-30 22:27:21 -08:00 |
|
timb_dma.c
|
mfd: Use mfd cell platform_data for timberdale cells platform bits
|
2011-05-26 19:45:05 +02:00 |
|
TODO
|
dmaengine: add TODO items for future work on dma drivers
|
2011-05-26 14:44:30 -07:00 |
|
txx9dmac.c
|
|
|
|
txx9dmac.h
|
|
|