o Feature: Merged NAPI support from Robert Olsson

o Bug fix: moved tx_timeout processing from interrupt context 
  to process context so h/w controller reset can busy-wait.

o Bug fix: ethtool SSET and NWAY we're broken when !netif_running.
o Cleanup: removed PPC code optimization - not needed.
o Bug fix: workaround for Dell Avalon system: change descriptor
  write-back policy to write back 16 bytes rather than 8 bytes.
o Bug fix: added mwb() to force memory transaction ordering on ia-64.
o Cleanup: misc. whitespace cleanup.

o Feature: added new interrupt mitigation knobs.

o Change license from Dual BSD/GPL to GPL

o Forward port of changes from 2.4.20-pre4:
   o ethtool security fixes from Alan Cox
   o usec_delay to udelay (Jeff Garzik)
   o #include <linux/sched.h> for Alpha (Jeff Garzik)

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

o Bug fix: ethernet bridging not working
o Bug fix: mii-diag does not update driver's speed, 
  duplex, and flow control
o Bug fix: ethtool shows wrong speed/duplex when not connected
o Bug fix: ethtool shows wrong speed/duplex when reconnected if
  forced speed/duplex
o Bug fix: ethtool PHY loopback diagnostic fails

(yay!)
o Changed license from Dual BSD/GPL to GPL

o Feature: added e100 GREGS register dump for ethtool
o Bug fix: promiscuous mode was broken
o Bug fix: register ethx as name when requesting interrupt.
o Bug fix: ARP WOL fails

o Cleanup: sync with driver in 2.4.20-pre4.  includes small cleanups,
  and a security fix.

Instead of checking for cetain architectures in the Makefile set
CONFIG_HW_CONSOLE in Config.in if we support a hardware console. 

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

This gets it to compile but leaves us without a keyboard beep on
powermac and APUS for now.

This puts back the definitions of ide_request/free_irq,
ide_check/request/release_region, ide_fix_driveid etc. that were
removed while Martin Dalecki was IDE maintainer.

This fixes a compile error.

This is extra syscall entries + KM_IRQ0/1.

Couple of last-minute fixes please:

- Partial fix for the LRU race which Christian Ehrhardt identified.

- Delete a bogus BUG() in __page_cache_release

isn't there.

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

standard lists conversion.

into suse.cz:/home/vojtech/bk/pat

all the control request fields properly.

Found by Anton Blanchard.

into 2.5 - kbd0 init, sysrq support, show_regs, show_mem, show_state
support, correct handling of shifts across vt switches, console
blanking, console callback. Hope that's all.

into suse.cz:/home/vojtech/bk/pat

by input merge

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-input