leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
deb9a75e62
linux/arch/arm/mach-s5pv210/include/mach
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
..
clkdev.h ARM: SAMSUNG: Added mach/clkdev.h 2011-07-21 02:04:14 +09:00
debug-macro.S arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
dma.h S5PV210: DMA: Add platform devices for PL330 DMACs 2010-05-18 18:00:13 +09:00
entry-macro.S
gpio.h Fix common misspellings 2011-03-31 11:26:23 -03:00
hardware.h
io.h
irqs.h ARM: S5PV210: Fix security engine interrupt names 2011-03-28 16:17:53 +09:00
map.h ARM: S5P: Add support for MFC device 2011-07-21 17:29:00 +09:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
pm-core.h ARM: SAMSUNG: Add support for pre-sleep/post-restore gpio control 2011-07-20 23:13:20 +09:00
pwm-clock.h ARM: S5PV210: Bug fix on PWM Timer 2010-05-11 09:32:40 +09:00
regs-audss.h ARM: SAMSUNG: Add platform device for idma 2011-07-21 14:12:19 +09:00
regs-clock.h ARM: S5P: Add support for common MIPI CSIS/DSIM D-PHY control 2011-03-11 15:49:01 +09:00
regs-gpio.h ARM: S5P: Unify defines for both gpio interrupt types 2010-10-21 07:54:57 +09:00
regs-irq.h ARM: S5PV210: Add IRQ support 2010-02-24 22:47:22 +00:00
regs-sys.h ARM: S5PV210: Enable USB HSOTG gadget build 2010-10-21 07:54:56 +09:00
spi-clocks.h ARM: S5PV210: Define SPI platform devices 2010-05-20 19:31:10 +09:00
system.h ARM: S5P: Add Support common arch_reset() for S5P 2010-08-05 18:30:22 +09:00
tick.h
timex.h
uncompress.h
vmalloc.h ARM: S5P: Change VMALLOC_END to use more vmalloc()/ioremap() area 2010-10-25 16:11:50 +09:00