Linus Torvalds 95f3eff699 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits)
  [netdrvr] hp100: encapsulate all non-module code
  drivers/net/wireless/{airo,ipw2100}: fix error handling bugs
  [netdrvr] phy: Fix bugs in error handling
  [PATCH] spidernet: Use pci_dma_mapping_error()
  [PATCH] sky2: version 1.9
  [PATCH] sky2: fragmented receive for large MTU
  [PATCH] sky2: use netif_tx_lock instead of LLTX
  [PATCH] sky2: incremental transmit completion
  [PATCH] sky2: name irq after eth for irqbalance
  [PATCH] sky2: workarounds for some 88e806x chips
  [PATCH] sky2: use standard pci register capabilties for error register
  [PATCH] sky2: gigabit full duplex negotiation
  e100, e1000, ixgb: increment version numbers
  ixgb: convert to netdev_priv(netdev)
  ixgb: combine more rx descriptors to improve performance
  e1000: possible memory leak in e1000_set_ringparam
  e1000: Janitor: Use #defined values for literals
  e1000: don't strip vlan ID if 8021q claims it
  e1000: rework polarity, NVM, eeprom code and fixes.
  e1000: driver state fixes (race fix)
  ...
2006-10-02 08:56:58 -07:00
..
2006-09-25 16:52:15 -04:00
2006-09-25 16:52:15 -04:00
2006-09-25 16:52:14 -04:00
2006-09-25 16:52:16 -04:00
2006-07-05 13:42:58 -04:00
2006-09-25 16:52:15 -04:00
2006-09-25 16:52:15 -04:00
2006-09-28 18:00:55 -07:00
2006-09-25 16:52:15 -04:00

	README
	------

	This directory is mostly for Wireless LAN drivers, in their
various incarnations (ISA, PCI, Pcmcia...).
	This separate directory is needed because a lot of driver work
on different bus (typically PCI + Pcmcia) and share 95% of the
code. This allow the code and the config options to be in one single
place instead of scattered all over the driver tree, which is never
100% satisfactory.

	Note : if you want more info on the topic of Wireless LANs,
you are kindly invited to have a look at the Wireless Howto :
		http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
	Some Wireless LAN drivers, like orinoco_cs, require the use of
Wireless Tools to be configured :
		http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html

	Special notes for distribution maintainers :
	1) wvlan_cs will be discontinued soon in favor of orinoco_cs
	2) Please add Wireless Tools support in your scripts

	Have fun...

	Jean