linux_dsm_epyc7002/arch/mips/alchemy
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
devboards MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
gpr MIPS: Alchemy: Add basic support for the GPR board 2010-08-05 13:26:09 +01:00
mtx-1 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
xxs1500 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
Kconfig MIPS: Alchemy: Add basic support for the GPR board 2010-08-05 13:26:09 +01:00
Platform MIPS: Alchemy: Add basic support for the GPR board 2010-08-05 13:26:09 +01:00