Add help texts for CONFIG_PCMCIA_AXNET and CONFIG_PCMCIA_XIRCOM

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

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

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

Integrate ALSA into v2.5.4

            Jaroslav

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

  condition, we test the preemption count in preempt_schedule(). This reduces the icache
  footprint and the overhead of preemption.

- plus optimize the irq-path preemption check a bit.

this is a fragile piece of the ptrace code, the code relies on a single wakeup coming from the parent.
This fix is necessery after the preempt_schedule() cleanups, it unbreaks 'strace strace ...'.

fixes a preemption race that was introduced by my removal of PREEMPT_ACTIVE.

into hostme.bitkeeper.com:/ua/repos/g/gkernel/net-drivers-2.5

into hostme.bitkeeper.com:/ua/repos/g/gkernel/misc-2.5

- the PREEMPT_ACTIVE trick is not needed

- schedule() should check for need_resched, we might miss a
  reschedule otherwise.

the cleanup also fixes the bug. The only reason why i kept
preempt_schedule() was to fix up p->state to TASK_RUNNING,
to make it possible to preempt from places that mark the
task TASK_UNINTERRUPTIBLE before adding the task to a waitqueue,
and thus a preemption in that small window could cause the
task to be removed from the runqueue erroneously.

Contributor: Ed Vance @ Macrolink

Contributor: Go Taniguchi

into bmac and mace net drivers.

Via Dave Jones.

'sungem' which DaveM is maintaining is the replacement.

net driver.  Also included are a couple of minor error reporting
updates and the proper detection for cardbus removal.

Contributor:
Mike Phillips
Linux Token Ring Project

the ibmtr token ring net driver. 

Contributor:
Mike Phillips
Linux Token Ring Project

* Only print warning on truly "oversized" packets
* Fix theoretical bug on gigabit cards - return to 1.1.3 behavior

Contributor: Val Henson

from 2.4.x.
Also, remove deprecated SIOCDEVPRIVATE ioctl calls.

Via Dave Jones.

0.13a - optical transceiver support added
	by Michael Clark <michael@metaparadigm.com>
0.13b - call register_netdev earlier in initialization
	suppress duplicate link status messages
0.15	get ppc (big endian) working

Via Dave Jones.

Fix originally by Andreas Dilger IIRC, merged by Dave Jones.

Via Dave Jones.

for dmfe net driver from 2.4.x.

Via Dave Jones.

which prevented the driver from building.

Via Dave Jones.

net drivers.  Merge two sis900 bug fixes from 2.4.x.

Via Dave Jones.

3c59x, eepro100, sis900, and tulip.

Also, update eepro100 Becker URL.

Contributor: Dave Jones

Via Dave Jones.

for net drivers 3c509, acenic, ni52, and skfp.

Via Dave Jones.

	BKL shifted into all instances of ->truncate().  Callers updated.

	OK, here comes: ->lookup() had lost BKL, all in-tree instances of
->lookup() converted.

	I'm adding Documentation/filesystems/porting - with the list of
API changes since 2.4.  Are you OK with that format?

(and yes, this sucker is *post*-compile ;-)

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

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

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