FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-23 18:07:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
cfaf8fc5b5
linux/arch/arm/mach-exynos4
History
Arnd Bergmann cfaf8fc5b5 Merge branch 'depends/rmk/memory_h' into next/cleanup2 
There are lots of conflicts between the omap and exynos cleanups
and the memory.h remove series.

Conflicts:
	arch/arm/mach-exynos4/mach-smdkc210.c
	arch/arm/mach-exynos4/mach-smdkv310.c
	arch/arm/mach-imx/mach-cpuimx27.c
	arch/arm/mach-omap1/board-ams-delta.c
	arch/arm/mach-omap1/board-generic.c
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/board-nokia770.c
	arch/arm/mach-omap1/board-osk.c
	arch/arm/mach-omap1/board-palmte.c
	arch/arm/mach-omap1/board-palmtt.c
	arch/arm/mach-omap1/board-palmz71.c
	arch/arm/mach-omap1/board-sx1.c
	arch/arm/mach-omap1/board-voiceblue.c
	arch/arm/mach-omap1/io.c
	arch/arm/mach-omap2/board-generic.c
	arch/arm/mach-omap2/io.c
	arch/arm/plat-omap/io.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-11-01 04:58:59 +01:00
..
include/mach Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
clock-exynos4210.c ARM: EXYNOS4: Add support PM for EXYNOS4212 2011-09-16 16:39:05 +09:00
clock-exynos4212.c ARM: EXYNOS4: Add support PM for EXYNOS4212 2011-09-16 16:39:05 +09:00
clock.c Merge branch 'next-samsung-board-2' into next-samsung-devel-2 2011-10-04 20:20:21 +09:00
cpu.c Merge branch 'next-samsung-board-2' into next-samsung-devel-2 2011-10-04 20:20:21 +09:00
cpuidle.c
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 ARM: EXYNOS4: register the second instance of pl330 DMAC 2011-09-19 10:27:19 +09:00
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
irq-eint.c ARM: EXYNOS4: add required chained_irq_enter/exit to eint code 2011-08-19 20:57:37 +09:00
Kconfig ARM: S5P: Make the sleep code common for S5P series SoCs 2011-10-04 20:25:51 +09:00
mach-armlex4210.c ARM: mach-exynos4: convert boot_params to atag_offset 2011-08-21 17:14:47 -04:00
mach-nuri.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-origen.c Merge branch 'next-samsung-board-2' into next-samsung-devel-2 2011-10-04 20:20:21 +09:00
mach-smdk4x12.c ARM: EXYNOS4: Add support SMDK4412 Board 2011-10-04 18:35:04 +09:00
mach-smdkv310.c Merge branch 'next-samsung-board-2' into next-samsung-devel-2 2011-10-04 20:20:21 +09:00
mach-universal_c210.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
Makefile ARM: S5P: Make the sleep code common for S5P series SoCs 2011-10-04 20:25:51 +09:00
Makefile.boot
mct.c ARM: EXYNOS4: Add MCT support for EXYNOS4412 2011-10-04 18:35:03 +09:00
platsmp.c ARM: EXYNOS4: Add functions for gic interrupt handling 2011-10-04 18:35:02 +09:00
pm.c Merge branch 'next-samsung-devel' into next-samsung-devel-2 2011-10-04 20:18:36 +09:00
pmu.c ARM: EXYNOS4: Support suspend/resume for EXYNOS4212 2011-10-04 18:59:36 +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 ARM: EXYNOS4: fix incorrect pad configuration for keypad row lines 2011-09-15 15:54:20 +09:00
setup-sdhci-gpio.c
setup-sdhci.c ARM: SAMSUNG: remove sdhci default configuration setup platform helper 2011-10-04 19:48:40 +09:00
setup-usb-phy.c ARM: EXYNOS4: Increase reset delay for USB HOST PHY 2011-08-19 20:57:39 +09:00