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
..
acorn
acpi	Make sure to re-enable SCI after an ACPI suspend	2006-06-19 18:05:09 -07:00
amba
atm	[PATCH] Replace 0xff.. with correct DMA_xBIT_MASK	2006-03-28 09:16:07 -08:00
base	[PATCH] revert "swsusp add check for suspension of X controlled devices"	2006-05-31 16:27:11 -07:00
block	[NET]: Clean up skb_linearize	2006-06-17 21:30:16 -07:00
bluetooth	[PATCH] pcmcia: use bitfield instead of p_state and state	2006-03-31 17:26:33 +02:00
cdrom	[PATCH] fix cdrom open	2006-06-17 10:44:26 -07:00
char	Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart	2006-06-19 18:51:41 -07:00
connector	[CONNECTOR]: Fix warning in cn_queue.c	2006-06-17 21:29:43 -07:00
cpufreq	[CPUFREQ] cpufreq core {d,}printk adjustments	2006-06-04 19:47:38 -04:00
crypto	[CRYPTO] api: Align tfm context as wide as possible	2006-03-21 20:14:08 +11:00
dio	[PATCH] hp300: fix driver_register() return handling, remove dio_module_init()	2006-03-25 08:22:53 -08:00
dma	[I/OAT]: Do not use for_each_cpu().	2006-06-17 21:25:58 -07:00
edac	[PATCH] EDAC Coexistence with BIOS	2006-05-03 20:05:41 -07:00
eisa	[PATCH] EISA: Ignore generated file drivers/eisa/devlist.h	2006-03-25 08:23:01 -08:00
fc4
firmware	[PATCH] DMI: move dmi_scan.c from arch/i386 to drivers/firmware/	2006-04-14 11:41:25 -07:00
hwmon	[PATCH] w83792d: Be quiet on misdetection	2006-04-14 11:18:33 -07:00
i2c	[PATCH] scx200_acb: fix section mismatch warning	2006-05-26 11:55:46 -07:00
ide	[PATCH] sgiioc4: use mmio ops instead of port io	2006-05-31 16:27:11 -07:00
ieee1394	[PATCH] sbp2: fix check of return value of hpsb_allocate_and_register_addrspace()	2006-06-05 12:29:16 -07:00
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2006-06-19 19:01:59 -07:00
input	Input: psmouse - DMI updates for lifebook protocol	2006-05-29 23:31:12 -04:00
isdn	[PATCH] Overrun in isdn_tty.c	2006-05-21 12:59:18 -07:00
leds	[PATCH] LED: Fix sysfs store function error handling	2006-05-15 11:20:56 -07:00
macintosh	[PATCH] powerpc: fix oops in alsa powermac driver	2006-04-21 22:34:26 +10:00
mca
md	[PATCH] md: Fix badness in sysfs_notify caused by md_new_event	2006-05-31 16:27:11 -07:00
media	[NET]: Add netif_tx_lock	2006-06-17 21:30:14 -07:00
message	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6	2006-06-10 11:03:51 -07:00
mfd	[PATCH] show MCP menu only on ARCH_SA1100	2006-03-24 07:33:28 -08:00
misc	[PATCH] Make most file operations structs in fs/ const	2006-03-28 09:16:06 -08:00
mmc	[MMC] Prevent au1xmmc.c breakage on non-Au1200 Alchemy	2006-06-04 17:40:58 +01:00
mtd	[PATCH] Remove blkmtd	2006-04-11 06:18:43 -07:00
net	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2006-06-19 19:07:12 -07:00
nubus
oprofile	[PATCH] mark f_ops const in the inode	2006-03-28 09:16:05 -08:00
parisc	[PARISC] Document that we tolerate "Relaxed Ordering"	2006-04-21 22:20:33 +00:00
parport	[PATCH] parport_pc: fix section mismatch warnings (v2)	2006-04-19 09:13:52 -07:00
pci	Merge branch 'master' into upstream	2006-06-13 20:29:04 -04:00
pcmcia	[PATCH] pcmcia: missing pcmcia_get_socket() result check	2006-06-02 00:56:17 +02:00
pnp	[PATCH] pnp: fix two messages in manager.c	2006-04-19 09:13:52 -07:00
rapidio
rtc	[PATCH] m48t86: ia64 build fix	2006-06-05 12:29:17 -07:00
s390	Merge branch 'master' into upstream	2006-06-08 15:24:46 -04:00
sbus	[SPARC]: Fix warning on prom_getproperty in openprom.c	2006-05-12 12:53:59 -07:00
scsi	Improve SATA core suspend/resume	2006-06-19 18:01:27 -07:00
serial	[PATCH] ppc32 CPM_UART: various fixes for pq2 uart users	2006-05-26 22:38:56 +10:00
sh
sn	[PATCH] Altix: correct ioc4 port order	2006-05-03 20:05:41 -07:00
spi	[PATCH] s3c24xx: fix spi driver with CONFIG_PM	2006-05-26 11:55:46 -07:00
tc	[PATCH] kill _INLINE_	2006-03-23 07:38:16 -08:00
telephony	[PATCH] pcmcia: use bitfield instead of p_state and state	2006-03-31 17:26:33 +02:00
usb	Merge branch 'master' into upstream	2006-06-13 20:29:04 -04:00
video	Merge branch 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6	2006-06-19 18:53:20 -07:00
w1	fix typos "wich" -> "which"	2006-03-24 18:23:14 +01:00
zorro	[PATCH] amiga: fix driver_register() return handling, remove zorro_module_init()	2006-03-25 08:22:53 -08:00
Kconfig	[I/OAT]: DMA memcpy subsystem	2006-06-17 21:18:43 -07:00
Makefile	[I/OAT]: DMA memcpy subsystem	2006-06-17 21:18:43 -07:00