From: Manfred Spraul <manfred@colorfullife.com>

three build fixes for CONFIG_PROC_FS=n:

include/linux/procfs.h:

 - add missing proc_pid_unhash, proc_pid_flush declarations.  static
   inline functions that do nothing.

 - move semicolons around for kclist_{add,del}.  gcc-3.2.2 doesn't like
   the current syntax.

drivers/net/pppoe.c:

 - proc_net doesn't exist if CONFIG_PROC_FS=n.

drivers/scsi/scsi_priv.h:

 - add missing brackets to macro definition.

From: Andrey Panin <pazke@donpac.ru>

This small patch (against 2.5.70) updates visws_apic.c in accordance
with linux irq handling changes.

From: Jan Marek <linux@hazard.jcu.cz>

The DRM modules (i810) need this symbol.

As this is a special-case for one particular in-kernel module I changed Jan's
patch from EXPORT_SYMBOL to EXPORT_SYMBOL_GPL.

From: Milton Miller <miltonm@bga.com>

mm is NULL for kernel threads without their own context.  active_mm is
maintained the one we lazly switch from.

Without this patch, apm bios initiated suspend events (eg panel close)
cause an oops on resume in the LDT restore, killing kapmd, which causes
further events to not be polled.

From: Pavel Machek <pavel@ucw.cz>

This fixes suspend when pccards are used...

We want an "|" in there, not "||".

The m68knommu/pilot startup code is not copying the init segment to
RAM currently. Fix it to copy all of the data and init sections to RAM.

Support pre-configured boot arguments on m68knommu/5206e targets.

Support pre-configured boot arguments on m68knommu/5206 targets.

Make the ROMfs copy in the startup code for ARNEWSH/5260 board
conditional on actually using a ROMfs setup.

(i.e. the better fix)

into redhat.com:/garz/repo/net-drivers-2.5

The needed fix winds up breaking SG, checksumming, and other stuff
in the process.

Ouch.

* Dynamic interrupt coalescing
* mii lib support
* dynamic IPG support (disabled by default)
* jumbo frame fix
* vlan fix
* rx irq coalescing fix

More K&R to ANSI C conversions for lib/zlib_deflate.

Here are some more K&R to ANSI C conversions.

into home.transmeta.com:/home/torvalds/v2.5/linux

Linker script updates for m68knommu architecture:

 - fix _ramend for DragonEngine2 board
 - add  security init call support

Clean up the dodgy is_in_rom() code for m68knommu targets.

Now that all the m68knommu sub-architectures (68x328, 68360
and ColdFire) have the same memory setup support we can
make this code the same for all targets.

Change the m68knommu specific calls to do_fork() to match
its pid return vlue.

 - Unrevert strncpy->strlcpy change in JEDEC chip driver
 - Fix partition handling in physmap map driver
 - Switch sa1100-flash map driver back to rmk's version.

into infradead.org:/inst/bk/linus-2.5

into redhat.com:/garz/repo/net-drivers-2.5

in 8139too and pci-skeleton drivers.

* use pci_{request,release}_regions for PCI devices
* use alloc_etherdev (fixes race)
* propagate error returns from pci_xxx function errors

sys_wait4 can return a pid and in this case we want to copy the struct
rusage out to userspace.

This updates the orinoco driver, fixing many bugs and adding some minor
features.  It also adds a new module, orinoco_tmd for devices based on
the TMD7168 PCI<->PCMCIA adaptor.

into nuts.ninka.net:/home/davem/src/BK/net-2.5

Bug discovered by Mandred Spraul.

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

Also remove mouse_ps2.c which was never referenced from the Makefile.

GCC 3.3 complains that r2 overlaps input operands when a u64 pointer
is passed into __put_user().  Fix this by using ip as a temporary
register instead.