I'm getting a build error:

	fs/jfs/super.c: In function `jfs_fill_super':
	fs/jfs/super.c:335: parse error before `)'

and it doesn't happen with gcc-3.2.x.

Taking out the file-n-line fixes it up.  This patch was acked by shaggy.

Robbie Williamson found some bugs in the mandatory locking implementation.
This patch fixes all the problems he found:

 - Fix null pointer dereference caused by sys_truncate() passing a null filp.
 - Honour the O_NONBLOCK flag when calling ftruncate()
 - Local variable `fl' wasn't being initialised correctly in
   locks_mandatory_area()
 - Don't return -ENOLCK from __posix_lock_file() when FL_ACCESS is set.

We must grab lock before checking rl->count.

bio-to-request front merging works, but request-to-request has been
broken due to a bit too much copy'n pasting.

Cleaner fix for the ioscheduler:

- Problem with alias request, the new request gets lost.
- Must always clear merge hash in move_to_dispatch()

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

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

Just approving this as maintainer of i2o_scsi

This lets me put mca-legacy into drivers to fix them for now without
worrying about losing the fact they want more attention

There are no known cards outside of labs that used i2o_lan. The only
exception is the Redcreek VPN, which has its own driver anyway. Note
i2o_lan.h is left as i2o_config can still understand i2o_lan devices
such as the RedCreek.

The following patches should fix those last two issues - compiling boot.c
for UP and compiling proc.c by default.

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

  This is needed because mark_buffer_dirty is now checking if buffer is up to date.
  Noticed by Alex Tomas <bzzz@tmi.comex.ru>

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

into tetrachloride.(none):/mnt/stuff/kernel/2.5/cpufreq

into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart

into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart

into tetrachloride.(none):/mnt/stuff/kernel/2.5/cpufreq

New low level tms380 driver for Proteon 1392 / 1392+ cards
(port from existing 2.2 kernel code)

Add spinlock to fix race condition in tms380tr.

Fix startup of tmsisa to not register and unregister devices multiple
times, so hotplug doesn't run wild.

Add support for statically compiling tmsisa into kernel.

Remove unnecessary console SPAM during boot.

Fixed probing of ISA devices in tmsisa.

Fixed unsafe reference counting.

Fixed __init function causing Oops with new module system.

Rename tmsisa to skisa.

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

this trivial patch adds EEPRO100_PIO config option, which forces eepro100.c
driver to use pio instead of mmio. This option is necessary to support
onboard i82557 on sgi visual workstation.