arch/arm/mach-ux500/Makefile · eed1e576507b52e03e549e0c9e0c747978122403 · nexedi / linux

Merge branch 'stericsson/cleanup' into next/timer · eed1e576

Arnd Bergmann authored Oct 31, 2011

The timer and cleanup branches from stericsson conflict,
so I'm merging them here.

Conflicts:
	arch/arm/mach-ux500/Makefile
	arch/arm/mach-ux500/cpu.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

eed1e576

Makefile 774 Bytes

Replace Makefile