related SCTP socket options.

into us.ibm.com:/home/sridhar/BK/lksctp-2.6.1

into lips.borg.umn.edu:/export/music/bkroot/xfs-linux-2.6

We must not mark the process TASK_STOPPED early, because
that might allow a signal to wake it up before we actually
got to the "wake_up_forked_process()" state. Total confusion
would happen.

Make wake_up_forked_process() verify the new world order.

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

Spotted by Andreas Henriksson <andreas@scream.fjortis.info>

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

From: Anton Blanchard <anton@samba.org>

For a laugh we moved the BSS and our world exploded. Turns out we zero
from __bss_start to _end. Add __bss_stop to our section definitions so
we can use it instead.

From: Anton Blanchard <anton@samba.org>

Linas Vepstas has audited the ppc64 proc code and found a number of issues.

This fixes loading of modules compiled with debugging on
some platforms.

From Rusty.

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

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

Get off the drugs, Linus.

constant expression properly.

into nuts.ninka.net:/disk1/davem/BK/net-2.6

into nuts.ninka.net:/disk1/davem/BK/sparc-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

into nuts.ninka.net:/disk1/davem/BK/net-2.6

into nuts.ninka.net:/disk1/davem/BK/sparc-2.6

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.