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

* support latest wireless extensions
* update locking to use semaphores

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5

The patch below adds first round of AGP support for the Intel 460
chipset

This won't actually build at the moment, but I think you prefer to
merge things piecemeal, and this portion of the patch is almost
guaranteed to be safe (affects only ia64).

GCC3.1 apparently gets confused about uninitialized sections

Hi Linus,

Are you willing to change the interfaces of clear_user_page() and
copy_user_page() so that they can receive the relevant page pointer as
a separate argument?  I need this on ia64 to implement the lazy-cache
flushing scheme.

I believe PPC would also benefit from this.

	--david

On ia64 MP machines, we use the cycle counter register of each CPU to
obtain fine-grained time-stamps.  At boot-time, we synchronize the
counters as close as possible (similar to x86, though with a different
algorithm).  But even with this synchronization, there is still a
small (really: tiny) chance that a process bouncing from one CPU to
another could observe time going backwards.  To guard against this, I
maintain a global variable called "last_time_offset" which keeps track
of the largest time-interpolation value returned so far.  Most of this
is in platform-specific code (arch/ia64/kernel/time.c), but there are
a handful of places in platform-independent code where this variable
needs to be cleared to zero.  This is what the patch below does.  I
didn't put it inside CONFIG_IA64 because I think this can be useful
for other platforms, too.  I suppose I could put it inside CONFIG_SMP
though this would make the code uglier.  If you think it's OK, please
apply, otherwise, I'd appreciate your feedback.

This makes it possible to run the ia64 kernel both on platforms with the
legacy keyboard controller and those without (as is the case for the hp
zx1 platform, for example).  The new code is inside #ifdef CONFIG_IA64,
though it would probably be a good idea to enable it unconditionally.
The patch is by Alex Williamson.

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

stuff.

awful code with loops

into samba.org:/scratch/anton/linux-2.5_ppc64

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

into samba.org:/scratch/anton/linux-2.5_hvc_console

  The following patch fixes a few compiler warnings, as well as provides
blk_init_queue() with the appropriate arguments. Please review for
inclusion. Thanks to Jens Axboe for fixing the casting hack in
the previous version of this patch.

Don't know what exactly happened, but somehow, the ZX1 support is
in your tree twice. This patch drops one of them, and also adds
in Intel i845 support to make up for it 8-)

Another one from Brian Gerst. Still applies to 2.5.18

Seperates adfs_sb_info from struct super_block.

Andrew Morton found that egcs was miscompiling the per-cpu area code
on x86. This patch updates the check, and documentation accordingly.

TIMEOUT_VALUE was killed from blk.h and moved to drivers that need it (like this one)
DEVICE_REQUEST is also dead, so we init the queue with the driver request handler

Conversion done by William Irwin a good while ago.

Variant of a patch in 2.4 by Steven Whitehouse.

Originally from: Jeremy Elson <jelson@circlemud.org>

As per the old comment, this patch adds checking of the return
value of setup_arg_pages() and aborts cleanly. From 2.4
(also a missing GPL tag)