SGI Modid: 2.5.x-xfs:slinx:160900a

SGI Modid: 2.5.x-xfs:slinx:160899a

SGI Modid: 2.5.x-xfs:slinx:160622a

SGI Modid: 2.5.x-xfs:slinx:160504a

SGI Modid: 2.5.x-xfs:slinx:160445a

SGI Modid: 2.5.x-xfs:slinx:160314a

SGI Modid: 2.5.x-xfs:slinx:160246a

SGI Modid: 2.5.x-xfs:slinx:160245a

SGI Modid: 2.5.x-xfs:slinx:160244a

SGI Modid: 2.5.x-xfs:slinx:160243a

SGI Modid: 2.5.x-xfs:slinx:160242a

SGI Modid: 2.5.x-xfs:slinx:160241a

SGI Modid: 2.5.x-xfs:slinx:160225a

SGI Modid: 2.5.x-xfs:slinx:160178a

SGI Modid: 2.5.x-xfs:slinx:160172a

SGI Modid: 2.5.x-xfs:slinx:160171a

SGI Modid: 2.5.x-xfs:slinx:159760a

SGI Modid: 2.5.x-xfs:slinx:159720a

[XFS] Rename pagebuf debug option (ie. pagebuf tracing) into a generic XFS tracing option for the other XFS trace code to use too (once fixed).

SGI Modid: 2.5.x-xfs:slinx:159717a

dropping it cuts down on merge noise.  Simplifies the Makefile too.

into sgi.com:/source2/xfs-linux-2.6

From: Christoph Hellwig <hch@lst.de>

JFS currently clears i_sb in some error pathes which can make the
core kernel OOPS because it may never be NULL.  Noticed because some
IBM people try to "fix" the core kernel for it now..

From: Ingo Molnar <mingo@elte.hu>,

Voyager is getting odd deadlocks due to the taking of xtime_lock() in
sched_clock()->get_jiffies_64().

I had this patch queued up to fix a different deadlock, which occurs when we
relax the requirement that TSC's be synchronised across CPUs.  But it will
fix James' deadlock too.

From: Michael Hunold <hunold@convergence.de>

- move around sp887x firmware file entry to be close to sp887x selection

- fix a bunch of filenames to point to /usr/lib/hotplug/firmware/ rather
  then /etc/dvb

- fix the av7110 firmware config entry for "make allyesconfig"

From: Dave Kleikamp <shaggy@austin.ibm.com>

After Jose debugged the problem down to the routine jfs_get_parent, we
were able to find the problem.  I believe it only affects users of
NFS-exported JFS file systems on big-endian hardware.

The problem was a missing le32_to_cpu macro.  The patch also fixes a
return code to be more consistent other implementations of get_parent.

From: Greg KH <greg@kroah.com>

This fixes an oops when a kobject is unregistered before it's child is.
The usb-serial devices show this bug very easily (yank out a device
while its port is opened...)

Patch was originally written by Mike Gorse <mgorse@mgorse.dhs.org>

Add missing NR_VECTORS definition to visws and pc9800.  Also, make MSI
support dependent on CONFIG_X86_IO_APIC, as it won't build without IOAPIC
support.

into home.osdl.org:/home/torvalds/v2.5/linux

Also consolidate a bunch of convoluted if's into a single
"is this an r200 or r300" function.

The recent escd fix I have made corrects a thinko in the PnPBIOS code and it
turns out that faults from calling /proc/pnp/bus/escd were probably not caused
by BIOS bugs.

into home.osdl.org:/home/torvalds/v2.5/linux

Sometimes a menuconfig item is shown twice, so hide the other item.

Let gconf find it's glade file, even it's started with an absolute path
and check srcdir so it also works if it's compiled outside of the tree.

gconf compile warning fixes (by Buddy Lucas <b.lucas@ohra.nl>)

fix gconf segfault problem (by Romain Lievin <roms@tilp.info>)

generate an error if writing of kernel config failed