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
..
2011-03-31 11:26:23 -03:00
2011-04-01 09:34:51 +02:00
2010-10-21 15:51:58 +10:00
2011-04-01 09:34:51 +02:00
2010-08-02 10:44:03 +02:00
2011-03-09 08:09:57 +01:00
2009-03-27 14:25:15 +01:00
2010-08-04 10:22:35 +02:00
2010-08-04 10:22:35 +02:00