The actual return value of eth_header() is never used, only its sign.
So it does not make a difference if we return dev->hard_header_len or
ETH_HLEN, but the latter makes more sense as that is the number of bytes
we added to the front of the frame.

For 99% of the drivers, dev->hard_header_len == ETH_HLEN, so no difference
at all, but if a driver actually needs additional headroom and thus
has dev->hard_header_len > ETH_HLEN, the process of building the ethernet
header should not care at all. 

into home.transmeta.com:/home/torvalds/v2.5/linux

* fix eeprom accesses
* fix tx desc overflow
* fix tx timeout bug
* add sis963 support

(contributed by Edward Peng @ D-Link)

(contributed by Edward Peng @ D-Link)

(contributed by Edward Peng @ D-Link, cleaned up by me)

conditionally include crc32.h, ethtool.h, mii.h, and compat.h
if built outside the stock 2.4.x kernel.

Conditionally enabled when out-of-tree, but open source, crypto lib
is present.

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

a directory pattern. Clean directories _first_, then files.

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

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

This URL evaporated long ago, and Alan claims it's not coming back.

Implement a "mapping change" notification for virtual lookup caches, and
make the futex code use that to keep the futex page pinning consistent
across copy-on-write events in the VM space.

into kroah.com:/home/greg/linux/BK/gregkh-2.5

the same ignore rules for "tar" as well.

x86-64 has an early console implementation which runs before the normal
console is initialized. To avoid duplicated output it needs to be
disabled when the real console starts. This patch adds an function call
for that to the appropiate part of console_init.

Add the PCI IDs of an AMD 8151 AGP bridge.

Add an AGP driver for the AGP aperture in the northbridge of the AMD Hammer.
The AGP driver works for both 32bit and 64bit kernels.

It also adds some hooks to the AGP driver to allow the x86-64 GART based
IOMMU code to share the aperture with AGP. The hooks are intentionally kept
minimalistic. In addition it needs some Config.in hackery, because AGP cannot
be modular in this case, because the IOMMU needs to control its startup and
it runs early when PCI is initialized.

The original AGP driver was done by Dave Jones, I added the IOMMU support.

Align ELF binary name for x86-64 with ABI.

Required for the x86-64 merge in other mail.

Make CONFIG_ACPI_SLEEP dependent on software suspend (because suspend
is not working yet on x86-64)

Add support for the HPET tables.

The m68k architecture define is __mc68000__, not __m68k__.

From Andreas Schwab <schwab@suse.de>.

  Fix undefined symbol references when support for G100 is requested,
but support for G450 is not.

into home.transmeta.com:/home/torvalds/v2.5/linux

into kleikamp.austin.ibm.com:/home/shaggy/bk/jfs-2.5

If the log (journal) superblock is changed between the time we mount
and unmount the volume, don't trap.  Instead complain, and exit
gracefully.

Always free the request, not just on error.

Small problem, we must of course also remember to take into account
where the last service point was (or will be).

deadline_get_last_sector() either returns the last offset serviced, or
the last one that will be (back of dispatch queue).

Otherwise the insert-at-head can be very unfair.

  Jens Thoms Toerring <Jens.Toerring@physik.fu-berlin.de>
    - RDP must be reset only in isolation phase

It appears that during the MODULE_LICENSE merge for pcmcia i82092 was
missed.

Here is a trivial patch to correct this.

This fixes a problem with the deadline io scheduler, if the correct
insertion point is at the front of the list.  This is something that we
never have gotten right in 2.4 either.

The problem is that the elevator merge function has to return a pointer
to a struct request, and for front insert we really have to return the
head of the list which cannot be expressed as a request of course.

The real issue is that the elevator_merge function actually performs two
functions - it scans for a merge, and if it can't find any, it selects
and insertion point.  It's done this way for efficiency reasons, even if
the design isn't all that clean.

So we change the io scheduler merge functions to get passed a pointer to
a list_head pointer instead.  This works for both inserts and merges.
In addition, deadline checks if it really should insert at the very
front.

Also don't pass in request to elv_try_last_merge(), the very name of the
function suggests that it's q->last_merge that we are interested in.