2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 05:04:00 +08:00
linux-next/arch/mips/sgi-ip27
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
..
ip27-berr.c MIPS: Stop using <asm-generic/int-l64.h>. 2009-03-30 14:49:41 +02:00
ip27-console.c arch: Remove unnecessary inclusions of asm/semaphore.h 2008-04-18 22:14:49 -04:00
ip27-hubio.c arch/mips/: Spelling fixes 2008-02-03 16:54:53 +02:00
ip27-init.c Fix common misspellings 2011-03-31 11:26:23 -03:00
ip27-irq.c Fix common misspellings 2011-03-31 11:26:23 -03:00
ip27-klconfig.c MIPS: IP27: klconfig.c checkpatch cleanup 2010-08-05 13:25:44 +01:00
ip27-klnuma.c MIPS: Nuke trailing blank lines 2010-02-27 12:53:14 +01:00
ip27-memory.c mm: make totalhigh_pages unsigned long 2010-01-11 09:34:03 -08:00
ip27-nmi.c MIPS: IP27: Convert nmi_lock lock to arch spinlock; 2010-02-27 12:53:38 +01:00
ip27-reset.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ip27-smp.c MIPS: SMP: Fix build. 2009-09-30 21:47:00 +02:00
ip27-timer.c 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
ip27-xtalk.c MIPS: Build fix - include <linux/smp.h> into all smp_processor_id() users. 2009-06-24 18:34:39 +01:00
Kconfig Fix common misspellings 2011-03-31 11:26:23 -03:00
Makefile MIPS: IP27: Migrate to new Platform file 2010-08-05 13:25:47 +01:00
Platform MIPS: IP27: Migrate to new Platform file 2010-08-05 13:25:47 +01:00
TODO Fix common misspellings 2011-03-31 11:26:23 -03:00