* default to PIO (fixes bugs in some chips), but add CONFIG_xxx option
  for MMIO
* proper support for variable MTU sizes
* add missing unregister_netdev in an error path
(with a kudos to Jason Lunz for merging most of this)

* support bitmapped printk message levels
* don't hand-code ethtool media support, use standard API/lib

        - Remove mii_preamble_required module parameter (Donald Becker)
        - Add per-interface mii_preamble_required (setting is autodetected)
          (Donald Becker)
        - Remove unnecessary cast from void pointer
        - Re-align comments in private struct

- Remove unused/constant members from struct pci_id_info
  (which then allows removal of 'drv_flags' from private struct)
- If no phy is found, fail to load that board
- Always start phy id scan at id 1 to avoid problems (Donald Becker)
- Autodetect where mii_preable_required is needed,
  default to not needed.  (Donald Becker)

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

by making 'smc_init' static.

Also, some cleanups.

s/insl_unswapped/insl_ns/ inside #ifdef __powerpc__

* add EISA 10/100 card id
* properly align rx skbs

device and protocol attach/detach support.

Overall, this is in preparation for update of HDLC API

linux-wlan-ng sources and online sources

MOD_{INC,DEC}_USE_COUNT, eliminating a small race

(contributed by matthias@waechter.wiz.at)

compile-enabled nor compileable in ages.

(originally by Arjan, merged and re-merged by hch)

it uses the following test to determine whether the timeout has
expired:

        if (jiffies - dma_start > PCNET_RDC_TIMEOUT) {

Unfortunately, PCNET_RDC_TIMEOUT is defined to be "0x02", so the
length of the timeout is only two jiffy ticks, rather than being
the expected 20ms.  This patch fixes this.

Also, the above (and one other place) should be converted to
time_after().

rid of save_flags();cli();. I was pleasantly surprised that the driver
was working fine on my SMP system with those obvious fixes. Tested on
2.5.32 SMP.

- Set dev->trans_start to avoid filling the logs
	(and generating useless abort commands)
- Avoid deadlocks in mmc_out()/mmc_in()

- Set dev->trans_start to avoid filling the logs
- Handle better spurious/bogus interrupt
- Avoid deadlocks in mmc_out()/mmc_in()

for the HostAP driver, with few cleanups and new unused
definitions. The most contention change is that this version now
requires user space to provide the buffer size when making a GET (to
check buffer overrun), which will break very old version of Wireless
Tools (v22 and earlier).

that are used in natsemi net driver

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

Andrew found out that bounce end_io handling did not work for him, so I
fixed the bug (not consistent checking of bi_size). I cleaned it up and
moved the bi_size checking out of bounce_end_io() (the main worker) and
into the individual bi_end_io() handlers instead. Please apply to make
highmem bouncing work again.

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

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

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

Fix a typo which was introduced when updating st5481 for the
USB API changes.

Sometimes bk still gets me... The previous changes won't work without
the updated top-level Makefile ;)

As we have a standard O_TARGET ("built-in.o"), use a standard L_TARGET
as well ("lib.a"), which is what was used in the majority cases already,
anyway.

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

into mandrakesoft.com:/home/jgarzik/repo/misc-2.5

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

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

into mandrakesoft.com:/home/jgarzik/repo/irda-2.5

It's shorter and more along the lines of the other "new-style"
statements.

Switch nbd bio_endio() over to new semantics

It's gone almost everywhere else already, and will eventually make for
a nicer top-level Makefile.