renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 06:04:14 +08:00
Code
cfaf8fc5b5
linux-next/arch/arm/mach-s5pv210
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.c ARM: S5P: add support for tv device 2011-10-04 18:58:26 +09:00
cpu.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
dev-audio.c ARM: SAMSUNG: Add IRQ_I2S0 definition 2011-07-21 17:27:28 +09:00
dev-spi.c ARM: SAMSUNG: Add tx_st_done variable 2011-07-06 15:03:08 +09:00
dma.c ARM: S5PV210: register the second instance of pl330 DMAC 2011-09-19 10:27:23 +09:00
init.c ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
Kconfig ARM: S5P: Make the sleep code common for S5P series SoCs 2011-10-04 20:25:51 +09:00
mach-aquila.c ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset 2011-08-21 17:15:12 -04:00
mach-goni.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-smdkc110.c ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset 2011-08-21 17:15:12 -04:00
mach-smdkv210.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-torbreck.c ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset 2011-08-21 17:15:12 -04:00
Makefile ARM: S5P: Make the sleep code common for S5P series SoCs 2011-10-04 20:25:51 +09:00
Makefile.boot ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
pm.c ARM: S5PV210: Fix build warning 2011-08-19 20:57:35 +09:00
setup-fb-24bpp.c ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210 2011-07-21 02:11:34 +09:00
setup-fimc.c ARM: S5P: Add platform helpers for camera GPIO configuration 2011-03-11 15:49:00 +09:00
setup-i2c0.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:51:09 +09:00
setup-i2c1.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:51:09 +09:00
setup-i2c2.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:51:09 +09:00
setup-ide.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:26 +09:00
setup-keypad.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:26 +09:00
setup-sdhci-gpio.c Fix common misspellings 2011-03-31 11:26:23 -03:00
setup-sdhci.c ARM: SAMSUNG: remove sdhci default configuration setup platform helper 2011-10-04 19:48:40 +09:00