From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Sat, 2 Dec 2006 04:55:21 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.20-rc1~15^2~9^2~467
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=116b23b0ed36f8d5b56d16ac50266fce8de904c1;hp=-c;p=cascardo%2Flinux.git

Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [PATCH] Fix an offset error when reading the CS89x0 ADD_PORT register
  [PATCH] spidernet: poor network performance
  [PATCH] Spidernet: remove ETH_ZLEN check in earlier patch
  [PATCH] bonding: fix an oops when slave device does not provide get_stats
  [PATCH] drivers/net: SAA9730: Fix build error
  Revert "[PATCH] zd1211rw: Removed unneeded packed attributes"
  [PATCH] zd1211rw: Fix of a locking bug
  [PATCH] softmac: remove netif_tx_disable when scanning
  [PATCH] ieee80211: Fix kernel panic when QoS is enabled
---

116b23b0ed36f8d5b56d16ac50266fce8de904c1
diff --combined drivers/net/Kconfig
index b6c70c58ae99,30ae712dff74..d3abf80ea3e2
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -32,7 -32,7 +32,7 @@@ config IF
  	tristate "Intermediate Functional Block support"
  	depends on NET_CLS_ACT
  	---help---
 -	  This is an intermidiate driver that allows sharing of
 +	  This is an intermediate driver that allows sharing of
  	  resources.
  	  To compile this driver as a module, choose M here: the module
  	  will be called ifb.  If you want to use more than one ifb
@@@ -1769,8 -1769,8 +1769,8 @@@ config VIA_RHINE_NAP
  	  information.
  
  config LAN_SAA9730
- 	bool "Philips SAA9730 Ethernet support (EXPERIMENTAL)"
- 	depends on NET_PCI && EXPERIMENTAL && MIPS
+ 	bool "Philips SAA9730 Ethernet support"
+ 	depends on NET_PCI && PCI && MIPS_ATLAS
  	help
  	  The SAA9730 is a combined multimedia and peripheral controller used
  	  in thin clients, Internet access terminals, and diskless
@@@ -2136,7 -2136,7 +2136,7 @@@ config SK98LI
  	  This driver supports the original Yukon chipset. A cleaner driver is 
  	  also available (skge) which seems to work better than this one.
  
 -	  This driver does not support the newer Yukon2 chipset. A seperate
 +	  This driver does not support the newer Yukon2 chipset. A separate
  	  driver, sky2, is provided to support Yukon2-based adapters.
  
  	  The following adapters are supported by this driver: