Linus Torvalds 61ce7b3ab5 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus ... * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Cleanup unnecessary <asm/ptrace.h> inclusions. [MIPS] DEC: pt_regs fixes for buserror handlers [MIPS] Fix return type of gt64120_irq. [MIPS] Ocelot C: Build fix - ll_mv64340_irq takes no more regs argument. [MIPS] Jazz defconfig file. [MIPS] Jazz: build fix - include <linux/screen_info.h> [MIPS] Jazz: Remove warning. After 7 years probably somebody test this ;) [MIPS] Jazz: Fix I/O port resources. [MIPS] DEC: pt_regs fixes for dec_intr_halt. handle_sysrq lost its pt_regs * argument Manual conflict resolved in arch/um/drivers/mconsole_kern.c		2006-10-08 16:42:11 -07:00
..
alpha	[PATCH] alpha pt_regs cleanups: collapse set_irq_regs() in titan_dispatch_irqs()	2006-10-08 12:32:36 -07:00
arm	ARM: fix up nested irq regs usage	2006-10-06 13:11:15 -07:00
arm26	Remove all inclusions of <linux/config.h>	2006-10-04 03:38:54 -04:00
avr32	[PATCH] AVR32: Allow renumbering of serial devices	2006-10-04 10:25:06 -07:00
cris	more misc typo fixes	2006-10-03 22:34:14 +02:00
frv	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
h8300	Remove all inclusions of <linux/config.h>	2006-10-04 03:38:54 -04:00
i386	[PATCH] i386/x86_64: Remove global IO_APIC_VECTOR	2006-10-08 12:24:02 -07:00
ia64	[PATCH] missed ia64 pt_regs fixes	2006-10-08 12:32:36 -07:00
m32r	[PATCH] m32r pt_regs fixes	2006-10-07 10:51:15 -07:00
m68k	[PATCH] m68k pt_regs fixes, part 2	2006-10-08 12:32:35 -07:00
m68knommu	Remove all inclusions of <linux/config.h>	2006-10-04 03:38:54 -04:00
mips	[MIPS] Cleanup unnecessary <asm/ptrace.h> inclusions.	2006-10-09 00:15:28 +01:00
parisc	[PARISC] More pt_regs removal	2006-10-07 06:01:11 -06:00
powerpc	Revert "[POWERPC] Don't get PCI IRQ from OF for devices with no IRQ"	2006-10-08 15:38:22 -07:00
ppc	handle_sysrq lost its pt_regs * argument	2006-10-09 00:15:27 +01:00
s390	[S390] Use CONFIG_GENERIC_TIME and define TOD clock source.	2006-10-06 16:38:48 +02:00
sh	fix file specification in comments	2006-10-03 23:01:26 +02:00
sh64	fix file specification in comments	2006-10-03 23:01:26 +02:00
sparc	[PATCH] sparc32 rwlock fix	2006-10-08 12:32:35 -07:00
sparc64	[PATCH] sparc64 pt_regs fixes	2006-10-08 12:32:35 -07:00
um	[PATCH] uml pt_regs fixes	2006-10-08 16:34:08 -07:00
v850	Remove all inclusions of <linux/config.h>	2006-10-04 03:38:54 -04:00
x86_64	[PATCH] x86_64 irq: Allocate a vector across all cpus for genapic_flat.	2006-10-08 12:24:02 -07:00
xtensa	fix file specification in comments	2006-10-03 23:01:26 +02:00