Russell King 58daf18cdc Merge branch 'clksrc' into devel ...

Conflicts:
	arch/arm/mach-vexpress/v2m.c
	arch/arm/plat-omap/counter_32k.c
	arch/arm/plat-versatile/Makefile

2011-01-05 18:09:03 +00:00

..

include/mach

ARM: GIC: private a standard get_irqnr_preamble assembler macro

2010-12-14 19:21:47 +00:00

core.h

ARM: GIC: consolidate gic_cpu_base_addr to common GIC code

2010-12-14 19:21:42 +00:00

ct-ca9x4.c

Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel

2011-01-05 18:08:10 +00:00

headsmp.S

ARM: 6508/1: vexpress: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL

2010-11-30 13:44:27 +00:00

Kconfig

…

localtimer.c

…

Makefile

…

Makefile.boot

…

platsmp.c

ARM: GIC: Remove MMIO address from gic_cpu_init, rename to gic_secondary_init

2010-12-14 19:21:40 +00:00

v2m.c

Merge branch 'clksrc' into devel

2011-01-05 18:09:03 +00:00