into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Ben Dooks

Place correct machine name for VR1000 in machine
support file.

Patch from John Lenz

make collie use the new INIT_MACHINE macro instead of arch_initcall.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

This patch adds an architecture-specific callout after explicit
processor migrations.  The callout allows architectures (or platforms)
to update TLB specific information (ex., cpu_vm_mask).
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: David Mosberger <davidm@hpl.hp.com>

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

into nuts.davemloft.net:/disk1/BK/sparc-2.6

Make mca.c build again with debug enabled.
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: David Mosberger <davidm@hpl.hp.com>

copy_from_user() moved from dvb_ringbuffer_{write,pkt_write}() to callers;
these functions are always getting kernel pointer now.  "usermem" argument
killed, code annotated.

	->readstat() and ->writecmd() are always getting a userland pointer;
marked argument as such, killed "user" flag, killed dead code.

	inlined functions moved, a couple of heavy-weight ones (issue_scb()
and meg_cmd_done()) uninlined.

into nuts.davemloft.net:/disk1/BK/sparc-2.6

into nuts.davemloft.net:/disk1/BK/sparc-2.6

into foobazco.org:/sources/2.5-sparc-todave

into kernel.bkbits.net:/home/wesolows/sparc32-2.6

into foobazco.org:/sources/2.5-sparc-todave

gcc doesn't understand that "asmlinkage" routines have the
argument stack owned by the assembly-language caller, and the
recent sparse cleanup made gcc think it owns enough stack
frame space to make a tailcall by overwriting "struct pt_regs"
that is set up by the low-level system call code.

Hide that problem again.

The real fix would be to tell gcc that the caller owns the
stack frame that it set up, but we don't have any such
interfaces, so for now the best we can do is to hide it.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

After Andi's timestamp optimizations we don't have any timestamps on the
packets unless someone requested them. Here's a patch for 2.6 to
explicitly timestamp the packets before we log them.

Harald approved it some time ago, he's pretty busy so I'm sending it
instead.
Signed-off-by: Martin Josefsson <gandalf@netfilter.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

This patch solves Bugzilla #2445 by removing a no longer available URL 
from the help text for NET_IPIP.

Noted by Nils Hammar <m4341@bedug.com>.
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: David S. Miller <davem@redhat.com>

into nuts.davemloft.net:/disk1/BK/net-2.6