leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
cfaf8fc5b5
linux/arch/arm/mach-s5p64x0/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: S5P64X0: Use generic DMA PL330 driver 2011-09-14 11:10:03 +05:30
entry-macro.S
gpio.h ARM: S5P64X0: Fix number of GPIO lines in Bank F 2011-03-04 15:46:26 +09:00
hardware.h
i2c.h ARM: S5P64X0: Add S5P6450 I2C support 2010-10-18 18:33:03 +09:00
io.h
irqs.h ARM: S5P64X0: Add register base and IRQ for Framebuffer 2011-10-04 19:00:39 +09:00
map.h ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
pm-core.h ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
regs-clock.h ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
regs-gpio.h ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
regs-irq.h ARM: S5P64X0: Update IRQ support 2010-10-18 18:33:03 +09:00
s5p64x0-clock.h
spi-clocks.h ARM: S5P64X0: Update Audio support 2010-10-18 18:33:03 +09:00
system.h
tick.h ARM: S5P64X0: Update Timer support 2010-10-18 18:33:03 +09:00
timex.h
uncompress.h ARM: zImage: remove the static qualifier from global data variables 2011-05-07 00:08:02 -04:00
vmalloc.h ARM: S5P: Change VMALLOC_END to use more vmalloc()/ioremap() area 2010-10-25 16:11:50 +09:00