OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
505ed6fd82
linux/arch/arm/mach-davinci
History
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
..
include/mach Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
aemif.c davinci: aemif: signedness bug in davinci_aemif_setup_timing() 2010-12-10 07:33:51 -08:00
board-da830-evm.c ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-07-18 15:29:58 -04:00
board-da850-evm.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
board-dm355-evm.c ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-07-18 15:29:58 -04:00
board-dm355-leopard.c ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-07-18 15:29:58 -04:00
board-dm365-evm.c Merge branch 'devel-stable' into for-next 2011-07-22 23:09:07 +01:00
board-dm644x-evm.c ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-07-18 15:29:58 -04:00
board-dm646x-evm.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
board-mityomapl138.c Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-07-24 10:20:54 -07:00
board-neuros-osd2.c ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-07-18 15:29:58 -04:00
board-omapl138-hawk.c ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-07-18 15:29:58 -04:00
board-sffsdr.c ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-07-18 15:29:58 -04:00
board-tnetv107x-evm.c ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-07-18 15:29:58 -04:00
cdce949.c
clock.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
clock.h Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
common.c
cp_intc.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
cpufreq.c [CPUFREQ] use dynamic debug instead of custom infrastructure 2011-05-04 11:50:57 -04:00
cpuidle.c
da830.c davinci: macro rename DA8XX_LPSC0_DMAX to DA8XX_LPSC0_PRUSS. 2011-03-11 10:48:29 -08:00
da850.c davinci: da850: add support for SATA interface 2011-07-08 11:13:08 +05:30
devices-da8xx.c davinci: da850: add support for SATA interface 2011-07-08 11:13:08 +05:30
devices-tnetv107x.c davinci: add tnetv107x ssp platform device 2011-03-15 08:17:22 -07:00
devices.c davinci: make PCM platform devices static 2011-06-08 14:41:37 +05:30
dm355.c Revert wrong fixes for common misspellings 2011-04-26 23:31:11 -07:00
dm365.c davinci: spi: move event queue parameter to platform data 2011-02-28 14:53:29 -08:00
dm644x.c Revert wrong fixes for common misspellings 2011-04-26 23:31:11 -07:00
dm646x.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
dma.c
gpio-tnetv107x.c davinci: tnetv107x: fix register indexing for GPIOs numbers > 31 2011-02-28 14:53:19 -08:00
gpio.c arm: davinci: Fix low level gpio irq handlers' argument 2011-07-12 14:21:43 +05:30
io.c
irq.c Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-19 22:10:05 -07:00
Kconfig ARM: Davinci: Fix I2C build errors 2011-04-25 14:19:32 +05:30
Makefile davinci: Initial support for Omapl138-Hawkboard 2010-09-24 07:40:32 -07:00
Makefile.boot
mux.c
mux.h
pm.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
psc.c davinci: enable forced transitions on PSC 2011-07-08 11:10:09 +05:30
serial.c
sleep.S
sram.c
time.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
tnetv107x.c davinci: add tnetv107x ssp platform device 2011-03-15 08:17:22 -07:00
usb.c DA8xx: assign name to MUSB IRQ resource 2010-12-11 12:15:53 +02:00