Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 04:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
cfaf8fc5b5
linux/arch/arm/mach-s5pv210/include/mach
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
..
debug-macro.S ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
dma.h ARM: S5PV210: Use generic DMA PL330 driver 2011-09-14 11:10:02 +05:30
entry-macro.S
gpio.h Fix common misspellings 2011-03-31 11:26:23 -03:00
hardware.h
io.h
irqs.h ARM: S5P: add support for tv device 2011-10-04 18:58:26 +09:00
map.h ARM: S5P: add support for tv device 2011-10-04 18:58:26 +09:00
memory.h ARM: mach-s5pv210: Setup consistent dma size at boot time 2011-08-22 12:00:11 +00:00
pm-core.h ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
regs-audss.h ARM: SAMSUNG: Add platform device for idma 2011-07-21 14:12:19 +09:00
regs-clock.h ARM: S5P: add support for tv device 2011-10-04 18:58:26 +09:00
regs-gpio.h ARM: S5P: Unify defines for both gpio interrupt types 2010-10-21 07:54:57 +09:00
regs-irq.h
regs-sys.h ARM: S5PV210: Enable USB HSOTG gadget build 2010-10-21 07:54:56 +09:00
spi-clocks.h ARM: S5PV210: Define SPI platform devices 2010-05-20 19:31:10 +09:00
system.h ARM: S5P: Add Support common arch_reset() for S5P 2010-08-05 18:30:22 +09:00
tick.h
timex.h
uncompress.h
vmalloc.h ARM: S5P: Change VMALLOC_END to use more vmalloc()/ioremap() area 2010-10-25 16:11:50 +09:00