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
..
common	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
fuloong-2e	MIPS: Loongson: Oprofile: add a new do_perfcnt_IRQ()	2010-08-05 13:26:24 +01:00
lemote-2f	MIPS: Loongson: Remove unused macro LOONGSON_PERFCNT_IRQ	2010-08-05 13:26:26 +01:00
Kconfig	MIPS: Fix always CONFIG_LOONGSON_UART_BASE=y	2011-03-14 21:07:26 +01:00
Makefile	MIPS: Lemote 2F: Add IRQ support	2009-12-17 01:57:13 +00:00
Platform	MIPS: Loongson: Migrate makefile to new Platform file	2010-08-05 13:25:45 +01:00