AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
df80442d1e
kernel_optimize_test/arch/arm/mach-omap1
History
Arnd Bergmann df80442d1e Merge branch 'depends/rmk/memory_h' into next/cleanup2 
Theis resolves lots of simple conflicts between the omap
cleanup and the mach/memory.h removal series.

Conflicts:
	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 13:47:27 +01:00
..
include/mach ARM: OMAP: move OMAP1 memory config from plat/memory.h to its mach/memory.h 2011-09-26 10:12:02 -04:00
ams-delta-fiq-handler.S Fix common misspellings 2011-03-31 11:26:23 -03:00
ams-delta-fiq.c
board-ams-delta.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-fsample.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-generic.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-h2-mmc.c
board-h2.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-h2.h
board-h3-mmc.c
board-h3.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-h3.h
board-htcherald.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-innovator.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-nokia770.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-osk.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-palmte.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-palmtt.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-palmz71.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-perseus2.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-sx1-mmc.c
board-sx1.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
board-voiceblue.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
clock_data.c
clock.c
clock.h
devices.c ARM: OMAP: Map SRAM later on with ioremap_exec() 2011-10-19 16:34:10 -07:00
dma.c arch/arm/mach-omap1/dma.c: Invert calls to platform_device_put and platform_device_del 2011-06-01 02:25:04 -07:00
flash.c ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info 2011-05-20 22:27:34 +01:00
fpga.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
gpio7xx.c Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 2011-07-22 14:50:57 -07:00
gpio15xx.c Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 2011-07-22 14:50:57 -07:00
gpio16xx.c Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 2011-07-22 14:50:57 -07:00
i2c.c
id.c
io.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 13:47:27 +01:00
irq.c omap: Use separate init_irq functions to avoid cpu_is_omap tests early 2011-06-16 05:42:09 -07:00
Kconfig
lcd_dma.c
leds-h2p2-debug.c
leds-innovator.c
leds-osk.c
leds.c
leds.h
mailbox.c
Makefile ARM: OMAP1: dmtimer: conversion to platform devices 2011-09-21 15:50:31 -07:00
Makefile.boot
mcbsp.c ARM: OMAP: mcbsp: Move address definitions to arch/arm/mach-omap1/mcbsp.c 2011-09-26 17:48:51 -07:00
mux.c
opp_data.c
opp.h
pm_bus.c PM: Rename clock management functions 2011-07-02 14:29:57 +02:00
pm.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
pm.h
reset.c
serial.c
sleep.S
sram.S
time.c omap: Set separate timer init functions to avoid cpu_is_omap tests 2011-06-20 01:25:39 -07:00
timer32k.c omap2+: Reserve clocksource and timesource and initialize dmtimer later 2011-06-27 12:14:01 -07:00
timer.c ARM: OMAP1: dmtimer: conversion to platform devices 2011-09-21 15:50:31 -07:00
usb.c