renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 21:54:06 +08:00
Code
cfaf8fc5b5
linux-next/arch/arm/mach-s5p64x0
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-s5p6440.c Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung 2011-09-19 10:30:49 +09:00
clock-s5p6450.c Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung 2011-09-19 10:30:49 +09:00
clock.c ARM: S5P: Reduce duplicated EPLL control codes 2010-10-25 16:05:56 +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: S5P64X0: Segregate audio devices 2010-12-30 08:24:27 +09:00
dev-spi.c ARM: S5P64X0: Use soc_is_s5p64x0() to distinguish cpu at runtime 2011-08-22 07:14:08 +09:00
dma.c Merge branch 'next-samsung-devel' into next-samsung-devel-2 2011-10-04 20:18:36 +09:00
gpiolib.c gpio/s5p64x0: move gpio driver into drivers/gpio/ 2011-09-21 10:52:39 +09:00
init.c ARM: S5P64X0: Add S5P64X0(S5P6440 and S5P6450) initialization support 2010-10-18 18:29:51 +09:00
irq-eint.c ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
irq-pm.c ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
Kconfig ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
mach-smdk6440.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-smdk6450.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
Makefile ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
Makefile.boot ARM: S5P64X0: Update Kconfig and Makefile 2010-10-18 10:33:34 +09:00
pm.c ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
setup-fb-24bpp.c ARM: S5P64X0: Add GPIO setup for LCD 2011-10-04 19:00:53 +09:00
setup-i2c0.c ARM: S5P64X0: Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:20 +09:00
setup-i2c1.c ARM: S5P64X0: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:53 +09:00