linux/arch/alpha
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
..
boot include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
include/asm Fix common misspellings 2011-03-31 11:26:23 -03: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
lib Fix common misspellings 2011-03-31 11:26:23 -03:00
math-emu alpha: change to new Makefile flag variables 2011-01-17 05:42:13 +01:00
mm alpha: change to new Makefile flag variables 2011-01-17 05:42:13 +01:00
oprofile Fix common misspellings 2011-03-31 11:26:23 -03:00
Kconfig genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
Kconfig.debug alpha/parisc: remove config variable DEBUG_RWLOCK 2008-02-06 10:41:03 -08:00
Makefile alpha: link failure fix 2008-06-20 16:46:10 -07:00
defconfig defconfig reduction 2010-08-14 22:26:53 +02:00