Linus Torvalds ea8df8c5e6 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] Fix wrong checksum for split TCP packets on 64-bit MIPS [MIPS] Fix BUG(), BUG_ON() handling [MIPS] Retry {save,restore}_fp_context if failed in atomic context. [MIPS] Disallow CpU exception in kernel again. [MIPS] Add missing silicon revisions for BCM112x		2007-04-20 22:57:51 -07:00
..
alpha	alpha: build fixes - force architecture	2007-04-17 16:36:27 -07:00
arm	[ARM] 4313/1: S3C24XX: Update s3c2410 defconfig to 2.6.21-rc6	2007-04-16 21:03:00 +01:00
arm26
avr32	[PATCH] gpio_direction_output() needs an initial value	2007-03-16 19:25:04 -07:00
cris	[PATCH] MSI-X: fix resume crash	2007-03-28 13:59:37 -07:00
frv	[PATCH] MSI-X: fix resume crash	2007-03-28 13:59:37 -07:00
h8300
i386	Longhaul - Revert ACPI C3 on Longhaul ver. 2	2007-04-20 22:56:29 -07:00
ia64	[IA64] SGI Altix : fix pcibr_dmamap_ate32() bug	2007-04-06 15:38:12 -07:00
m32r
m68k
m68knommu	[PATCH] m68knommu: remove local_bh_count	2007-03-06 18:08:38 -08:00
mips	[MIPS] Fix BUG(), BUG_ON() handling	2007-04-20 14:58:37 +01:00
parisc
powerpc	[POWERPC] mpc52xx_pic: fix main interrupt masking	2007-04-12 02:39:58 +10:00
ppc	[PPC] Fix compilation and linking errors of mpc86xads build.	2007-04-12 12:39:51 -05:00
s390	[S390] kprobes: Align probe address.	2007-03-26 20:43:46 +02:00
sh	sh: Kill bogus GCC4 symbol exports.	2007-03-28 17:24:47 +09:00
sh64
sparc	[SPARC]: Fix section mismatch warnings in pci.c and pcic.c	2007-04-12 13:47:37 -07:00
sparc64	[SPARC64]: Fix inline directive in pci_iommu.c	2007-04-13 13:35:35 -07:00
um	[PATCH] uml: fix unreasonably long udelay	2007-04-02 10:06:08 -07:00
v850
x86_64	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2007-04-17 16:51:32 -07:00
xtensa