kevin/linux
1
Fork 0
Code
9fc2071a65
linux/arch/arm/mach-exynos4
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 ARM: S5P: Add support for MFC device 2011-07-21 17:29:00 +09:00
clock.c ARM: S5P: Add support for MFC device 2011-07-21 17:29:00 +09:00
cpu.c ARM: EXYNOS4: Add platform device and helper functions for FIMD 2011-07-21 17:28:51 +09:00
cpuidle.c ARM: EXYNOS4: CPUIDLE Support 2011-05-06 09:36:47 +09:00
dev-ahci.c
dev-audio.c ARM: SAMSUNG: Add platform device for idma 2011-07-21 14:12:19 +09:00
dev-dwmci.c ARM: EXYNOS4: Add platform device for dwmci driver 2011-07-21 01:46:43 +09:00
dev-pd.c
dev-sysmmu.c
dma.c
headsmp.S ARM: EXYNOS4: Address a section mismatch w/ suspend issue. 2011-07-06 08:43:03 +09:00
hotplug.c ARM: EXYNOS4: Add support Core1 Power On/Off with hotplug in/out 2011-07-20 23:36:19 +09:00
init.c ARM: SAMSUNG: serial: Fix on handling of one clock source for UART 2011-06-07 09:25:34 -07:00
irq-combiner.c ARM: s5pv310: update IRQ combiner to use chained entry/exit functions 2011-05-11 16:04:15 +01:00
irq-eint.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
Kconfig 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
mach-armlex4210.c
mach-nuri.c ARM: EXYNOS4: Enable MFC on Samsung NURI 2011-07-21 17:29:20 +09:00
mach-smdkc210.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
mach-smdkv310.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
mach-universal_c210.c ARM: EXYNOS4: Enable MFC on universal_c210 2011-07-21 17:29:14 +09:00
Makefile 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
Makefile.boot
mct.c ARM: EXYNOS4: set the affinity of mct1 interrupt using IRQ_MCT_L1 2011-07-20 23:28:17 +09:00
platsmp.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
pm.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
pmu.c ARM: EXYNOS4: Support system level power down configuration 2011-07-20 23:38:07 +09:00
setup-fimc.c
setup-fimd0.c ARM: EXYNOS4: Add platform device and helper functions for FIMD 2011-07-21 17:28:51 +09:00
setup-i2c0.c
setup-i2c1.c
setup-i2c2.c
setup-i2c3.c
setup-i2c4.c
setup-i2c5.c
setup-i2c6.c
setup-i2c7.c
setup-keypad.c
setup-sdhci-gpio.c Fix common misspellings 2011-03-31 11:26:23 -03:00
setup-sdhci.c Fix common misspellings 2011-03-31 11:26:23 -03:00
setup-usb-phy.c ARM: S5P: Fix compilation error for exynos4_defconfig 2011-06-03 15:30:02 -07:00
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00