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

 IEEE1394 : Kbuildify oui2c.
 ALL      : C construct cleanups, macro namespace cleanups.
 ETH1394  : Limited multicast support. Minor fixes for IPv4 interop.
 ETH1394  : Add ethtool support.

Modify m68knommu do_settimeofday() routine to take "struct timespec"
argument, and adjust code to handle nsec size quantities.

Define missing type for CONFIG_KCORE_ELF in m68knommu/Kconfig.

This patch introduces pci_name() and converts slot_name into a pointer to
dev.bus_id.

 - Request resources before using them
 - Don't allocate GFP_KERNEL memory with interrupts disabled
 - Split pci_direct_init() into three functions to prevent it from
   getting too long.

Move all the SCSI Kconfig bits from arch/*/Kconfig into driver/scsi/Kconfig.
Also add notes about FireWire & USB.

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

 - Fix geometry reporting.
 - Avoid endless loop when deleting a Virtual Unit Chain.

Last November Linus applied a patch to remove the now-unused
*_segments() functions from all architectures ...  but some of the newer
architectures escaped and still have them.

As discussed earlier. The 64bit epoll ABI on AMD64 is changed to
match 32bit. This way we avoid emulation overhead.

To catch old binaries I allocate new syscall slots.

Without this patch ACPI won't compile on AMD64 because of mismatched prototypes.

Andrew stated that this is the way he wants it to be fixed.

Bring the x86-64 architecture code uptodate for 2.5.73.

One problem is that CONFIG_IDE_TASKFILE corrupts file systems on AMD 8111. It
may be worth to disable it in the configuration.

 - Disable 32bit vsyscalls for now until all bugs can be fixed
 - Fix warnings
 - Fix NULL pointer reference in 32bit ptrace
 - Timing fixes from John Stultz
 - Sync show_stack prototype
 - Sync nmi and floppy.h code (Mikael P.)
 - Set proper defines for AGP
 - Make Simics work again
 - Scale unit in 32bit sysinfo (originally from ppc64)

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

into nuts.ninka.net:/home/davem/src/BK/net-2.5

Check if DAD does not have source link-layer address option;
RFC2461 7.1.1.

Check if DAD is destined for solicited node multicast address
as RFC2461 required.

These patches fix ip multicast route (ipmr) on 2.5.73.

1 - Trivial C99 initialization
2 - Change functions/variables to static
3 - Drop and reacquire RTNL in error path
4 - Use time_after()
5 - Use alloc_netdev
6 - Fix OOPS on dropped packets
7 - Get rid of skb_linearize

Tested on 8-way SMP by bringing up pimd.

into osdl.org:/home/jmorris/bk/net/work-2.5

[Pointed out by Bjorn Helgaas via Arun Sharma]

This fixes an obvious cut and paste error in my original patch.

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

Needs more testing, especially in x8 mode.

Noticed by Marcelo Penna Guerra.

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