Linus Torvalds 0f166396e7 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus ... * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (62 commits) [MIPS] PNX8550: Cleanup proc code. [MIPS] WRPPMC: Fix build. [MIPS] Yosemite: Fix modpost warnings. [MIPS] Change names of local variables to silence sparse [MIPS] SB1: Fix modpost warning. [MIPS] PNX: Fix modpost warnings. [MIPS] Alchemy: Fix modpost warnings. [MIPS] Non-FPAFF: Fix warning. [MIPS] DEC: Fix modpost warning. [MIPS] MIPSsim: Enable MIPSsim virtual network driver. [MIPS] Delete Ocelot 3 support. [MIPS] remove LASAT Networks platforms support [MIPS] Early check for SMTC kernel on non-MT processor [MIPS] Add debugfs files to show fpuemu statistics [MIPS] Add some debugfs files to debug unaligned accesses [MIPS] rbtx4938: Fix secondary PCIC and glue internal NICs [MIPS] tc35815: Load MAC address via platform_device [MIPS] Move FPU affinity code into separate file. [MIPS] Make ioremap() work on TX39/49 special unmapped segment [MIPS] rbtx4938: Update and minimize defconfig ...		2007-07-10 14:48:43 -07:00
..
acorn	[PATCH] fix request->cmd == INT cases	2007-07-10 08:03:34 +02:00
acpi	ACPI: fix acpi_osi=!Linux	2007-07-02 21:06:48 -07:00
amba
ata	pata_pcmcia: Switch to ata_sff_port_start	2007-07-03 11:31:06 -04:00
atm	potential compiler error, irqfunc caller sites update	2007-07-06 10:23:43 -07:00
auxdisplay
base
block	Merge branch 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block	2007-07-10 13:51:06 -07:00
bluetooth
cdrom	Remove legacy CDROM drivers	2007-07-10 08:03:34 +02:00
char	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2007-07-10 14:48:43 -07:00
clocksource
connector
cpufreq
crypto
dio
dma	IOATDMA: fix section mismatches	2007-06-28 11:34:53 -07:00
edac
eisa
fc4
firewire	firewire: fw-sbp2: fix DMA mapping of management ORBs	2007-07-10 00:07:49 +02:00
firmware
hid	Merge branches 'debug-module-param' and 'upstream' into for-linus	2007-07-09 14:23:37 +02:00
hwmon	hwmon/coretemp: fix a broken error path	2007-06-24 08:59:10 -07:00
i2c
ide	[PATCH] fix request->cmd == INT cases	2007-07-10 08:03:34 +02:00
ieee1394	ieee1394: remove old isochronous ABI	2007-07-10 00:07:41 +02:00
infiniband	IPoIB/cm: Partial error clean up unmaps wrong address	2007-07-02 20:48:31 -07:00
input	Input: tsdev - fix broken usec-to-millisecs conversion	2007-07-10 00:43:06 -04:00
isdn
kvm
leds
macintosh	x86_64: Fix only make Macintosh drivers default on Macs	2007-06-22 18:41:18 -07:00
mca
md
media	V4L/DVB (5822): Fix the return value in ttpci_budget_init()	2007-07-03 15:11:21 -03:00
message
mfd	SM501: Check SM501 ID register on initialisation	2007-06-24 08:59:11 -07:00
misc	[PATCH] eeprom_93cx6: shorten pulse timing to match spec	2007-07-08 22:16:36 -04:00
mmc
mtd	[MIPS] remove LASAT Networks platforms support	2007-07-10 17:33:04 +01:00
net	[MIPS] Delete Ocelot 3 support.	2007-07-10 17:33:05 +01:00
nubus
oprofile
parisc
parport
pci
pcmcia
pnp	PNP SMCf010 quirk: work around Toshiba Portege 4000 ACPI issues	2007-07-06 10:23:43 -07:00
power	[BATTERY] One Laptop Per Child power/battery driver	2007-07-10 11:28:22 +01:00
ps3
rapidio
rtc
s390	[S390] vmlogrdr function annotation.	2007-07-10 11:24:54 +02:00
sbus
scsi	scsi disk help file is not complete	2007-07-02 10:12:34 -04:00
serial	PCMCIA-NETDEV : add new ID of lan&modem multifunction card	2007-07-08 22:16:39 -04:00
sh
sn
spi
tc	[MIPS] DEC: Fix modpost warning.	2007-07-10 17:33:05 +01:00
telephony
usb	potential compiler error, irqfunc caller sites update	2007-07-06 10:23:43 -07:00
video	fix section mismatch in chipsfb	2007-06-28 11:34:54 -07:00
w1	[BATTERY] ds2760 W1 slave	2007-07-10 11:28:31 +01:00
zorro
Kconfig	Merge git://git.infradead.org/~dwmw2/battery-2.6	2007-07-10 14:47:59 -07:00
Makefile	[BATTERY] Universal power supply class (was: battery class)	2007-07-10 11:25:44 +01:00