Thomas Gleixner a18f22a968 Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource ...

Conflicts:
	arch/ia64/kernel/cyclone.c
	arch/mips/kernel/i8253.c
	arch/x86/kernel/i8253.c

Reason: Resolve conflicts so further cleanups do not conflict further

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2011-05-14 12:06:36 +02:00

..

include

[IA64-SGI] Older PROM WAR for device flush code

2006-01-17 10:08:37 -08:00

kernel

Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource

2011-05-14 12:06:36 +02:00

pci

Fix common misspellings

2011-03-31 11:26:23 -03:00

Makefile

[IA64-SGI] Recursive flags do not work for selective builds

2006-01-26 13:17:34 -08:00