leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22fe678376
linux/arch/arm/mach-ux500/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
..
db5500-regs.h mach-ux500: update the DB5500 register file 2011-05-24 22:11:44 +02:00
db8500-regs.h mach-ux500: update the DB8500 register file 2011-05-24 22:11:43 +02:00
debug-macro.S ux500: remove build-time changing macros 2011-01-10 18:34:52 +01:00
devices.h ux500: rework device registration 2010-12-08 13:14:06 +01:00
entry-macro.S ux500: remove build-time changing macros 2011-01-10 18:34:52 +01:00
gpio.h ux500: rework gpio registration 2010-12-08 13:25:00 +01:00
hardware.h ARM: 6828/1: mach-ux500: delete SSP PrimeCell ID 2011-05-26 10:33:34 +01:00
id.h mach-ux500: update ASIC version detection 2011-05-24 22:11:46 +02:00
io.h ARM: 5829/1: ARM: U8500 register definitions 2009-11-28 10:22:51 +00:00
irqs-board-mop500.h mach-ux500: update SoC and board IRQ handling 2011-05-24 22:11:45 +02:00
irqs-board-u5500.h mach-ux500: update SoC and board IRQ handling 2011-05-24 22:11:45 +02:00
irqs-db5500.h mach-ux500: update SoC and board IRQ handling 2011-05-24 22:11:45 +02:00
irqs-db8500.h mach-ux500: update SoC and board IRQ handling 2011-05-24 22:11:45 +02:00
irqs.h mach-ux500: update SoC and board IRQ handling 2011-05-24 22:11:45 +02:00
mbox-db5500.h ux500: rename modem IRQ and MBOX files 2010-12-22 09:26:49 +01:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
setup.h ux500: dynamic SOC detection 2011-01-10 18:34:53 +01:00
system.h ARM: 5831/1: ARM: U8500 core machine support 2009-11-28 10:22:52 +00:00
timex.h ARM: 5831/1: ARM: U8500 core machine support 2009-11-28 10:22:52 +00:00
uncompress.h mach-ux500: setting proper uart for snowball 2011-06-23 12:04:55 +02:00
usb.h mach-ux500: add platform data for musb 2011-03-14 14:05:11 +01:00
vmalloc.h ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15 21:40:33 +00:00