Linus Torvalds 25f42b6af0 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus ... * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (51 commits) [MIPS] Make timer interrupt frequency configurable from kconfig. [MIPS] Correct HAL2 Kconfig description [MIPS] Fix R4K cache macro names [MIPS] Add Missing R4K Cache Macros to IP27 & IP32 [MIPS] Support for the RM9000-based Basler eXcite smart camera platform. [MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board [MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors. [MIPS] SN: include asm/sn/types.h for nasid_t. [MIPS] Random fixes for sb1250 [MIPS] Fix bcm1480 compile [MIPS] Remove support for NEC DDB5476. [MIPS] Remove support for NEC DDB5074. [MIPS] Cleanup memory managment initialization. [MIPS] SN: Declare bridge_pci_ops. [MIPS] Remove unused function alloc_pci_controller. [MIPS] IP27: Extract pci_ops into separate file. [MIPS] IP27: Use symbolic constants instead of magic numbers. [MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig. [MIPS] IP27: Cleanup N/M mode configuration. [MIPS] IP27: Throw away old unused hacks. ...		2006-06-19 19:07:12 -07:00
..
acpi	[PATCH] s/;;/;/g	2006-03-24 07:33:24 -08:00
asm-alpha	[PATCH] alpha: SMP IRQ routing fix	2006-06-05 12:29:16 -07:00
asm-arm	[ARM] 3547/1: PXA-OHCI: Allow platforms to specify a power budget	2006-06-08 22:44:07 +01:00
asm-arm26	[PATCH] unify pfn_to_page: arm26 pfn_to_page	2006-03-27 08:44:44 -08:00
asm-cris	[PATCH] sys_kexec_load() naming fixups	2006-04-11 06:18:42 -07:00
asm-frv	[PATCH] sys_kexec_load() naming fixups	2006-04-11 06:18:42 -07:00
asm-generic	[SPARC64]: Fix D-cache corruption in mremap	2006-06-01 17:47:25 -07:00
asm-h8300	[PATCH] sys_kexec_load() naming fixups	2006-04-11 06:18:42 -07:00
asm-i386	[PATCH] x86_64: avoid IRQ0 ioapic pin collision	2006-05-08 09:34:56 -07:00
asm-ia64	[IA64] remove asm-ia64/bitops.h self-inclusion	2006-05-05 11:37:15 -07:00
asm-m32r	[PATCH] m32r: update switch_to macro for tuning	2006-04-19 09:13:51 -07:00
asm-m68k	[PATCH] m68k: fix undefined reference to generic_find_next_zero_le_bit	2006-03-26 08:57:13 -08:00
asm-m68knommu	[PATCH] bitops: m68knommu: use generic bitops	2006-03-26 08:57:13 -08:00
asm-mips	[MIPS] Make timer interrupt frequency configurable from kconfig.	2006-06-19 17:39:27 +01:00
asm-parisc	[PARISC] Make ioremap default to _nocache	2006-04-21 22:20:35 +00:00
asm-powerpc	[PATCH] powerpc: enable CPU_FTR_CI_LARGE_PAGE for cell	2006-06-17 10:56:24 -07:00
asm-ppc	powerpc/32: Define an is_kernel_addr() to fix ARCH=ppc compilation	2006-05-09 16:00:59 +10:00
asm-s390	[PATCH] s390: fix in-user atomic futex operation.	2006-06-08 15:15:30 -07:00
asm-sh	[PATCH] sys_kexec_load() naming fixups	2006-04-11 06:18:42 -07:00
asm-sh64	[PATCH] sys_kexec_load() naming fixups	2006-04-11 06:18:42 -07:00
asm-sparc	[SPARC]: Add robust futex syscall entries.	2006-05-21 21:22:53 -07:00
asm-sparc64	[SPARC64]: Fix D-cache corruption in mremap	2006-06-01 17:47:25 -07:00
asm-um	[PATCH] uml: more __user annotations	2006-06-05 12:29:17 -07:00
asm-v850	[PATCH] Remove unused prepare_to_switch macro	2006-04-11 06:18:34 -07:00
asm-x86_64	[PATCH] x86_64: Fix stack/mmap randomization for compat tasks	2006-05-30 20:31:05 -07:00
asm-xtensa	[PATCH] request_irq(): remove warnings from irq probing	2006-04-28 08:33:46 -07:00
keys
linux	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2006-06-19 18:55:56 -07:00
math-emu
media	V4L/DVB (3702): Make msp3400 routing defines more consistent	2006-04-02 04:56:11 -03:00
mtd
net	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2006-06-19 18:55:56 -07:00
pcmcia	[PATCH] pcmcia: declare pccard_iodyn_ops (fix m8xx_pcmcia.c compilation error)	2006-03-31 21:49:51 +02:00
rdma	IB/uverbs: Don't serialize with ib_uverbs_idr_mutex	2006-06-17 20:44:49 -07:00
rxrpc
scsi	[SCSI] srp.h: Add I/O Class values	2006-06-17 20:37:38 -07:00
sound	[ALSA] Fix Oops at rmmod with CONFIG_SND_VERBOSE_PROCFS=n	2006-04-27 21:10:42 +02:00
video	[PATCH] Remove MODULE_PARM	2006-03-25 08:22:52 -08:00