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
..
ce4100	x86: ce4100: Configure IOAPIC pins for USB and SATA to level type	2011-04-28 11:38:30 +02:00
efi	x86: Move efi to platform	2010-10-27 14:30:01 +02:00
iris	x86: platform: Move iris to x86/platform where it belongs	2010-11-20 10:37:05 +01:00
mrst	x86/mrst: Fix boot crash caused by incorrect pin to irq mapping	2011-04-12 08:38:52 +02:00
olpc	mfd: OLPC: Clean up names to match what OLPC actually uses	2011-03-27 00:09:31 +01:00
scx200	x86: Move scx200 to platform	2010-10-27 14:30:01 +02:00
sfi	Merge branch 'linus' into x86/apic-cleanups	2011-01-07 14:14:15 +01:00
uv	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
visws	x86: visws: Fixup irq overhaul fallout	2011-04-04 16:51:15 +02:00
Makefile	x86: platform: Move iris to x86/platform where it belongs	2010-11-20 10:37:05 +01:00