[LinuxPPS] 21 Oct 20:40 - Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik ...

[linuxpps, Linus Torvalds <>]

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: (22 commits)  
[PATCH] ibmveth: Fix index increment calculation  
[PATCH] Fix timer race  
[PATCH] Remove useless comment from sb1250  
[PATCH] ucc_geth: changes to ucc_geth driver as a result of qe_lib changes and bugfixes  
[PATCH] sky2: 88E803X transmit lockup  
[PATCH] e1000: Reset all functions after a PCI error  
[PATCH] WAN/pc300: handle, propagate minor errors  
[PATCH] Update smc91x driver with ARM Versatile board info  
[PATCH] wireless: WE-20 compatibility for ESSID and NICKN ioctls  
[PATCH] zd1211rw: fix build-break caused by association race fix  
[PATCH] sotftmac: fix a slab corruption in WEP restricted key association  
[PATCH] airo: check if need to freeze  
[PATCH] wireless: More WE-21 potential overflows...  
[PATCH] zd1201: Possible NULL dereference  
[PATCH] orinoco: fix WE-21 buffer overflow  
[PATCH] airo.c: check returned values  
[PATCH] bcm43xx-softmac: Fix system hang for x86-64 with >1GB RAM  
[PATCH] bcm43xx-softmac: check returned value from pci_enable_device  
[PATCH] softmac: Fix WX and association related races  
[PATCH] bcm43xx: fix race condition in periodic work handler  
...  
  
drivers/net/Kconfig  
drivers/net/e1000/e1000_main.c  
drivers/net/ioc3-eth.c  
drivers/net/r8169.c  
drivers/net/sb1250-mac.c  
drivers/net/sky2.c  
drivers/net/smc91x.h  
drivers/net/ucc_geth.c  
drivers/net/ucc_geth.h  
drivers/net/ucc_geth_phy.c  
drivers/net/ucc_geth_phy.h  
drivers/net/wan/pc300_drv.c  
drivers/net/wireless/airo.c  
drivers/net/wireless/atmel.c  
drivers/net/wireless/bcm43xx/bcm43xx_dma.c  
drivers/net/wireless/bcm43xx/bcm43xx_dma.h  
drivers/net/wireless/bcm43xx/bcm43xx_leds.c  
drivers/net/wireless/bcm43xx/bcm43xx_main.c  
drivers/net/wireless/bcm43xx/bcm43xx_wx.c  
drivers/net/wireless/orinoco.c  
drivers/net/wireless/ray_cs.c  
drivers/net/wireless/zd1201.c  
drivers/net/wireless/zd1211rw/zd_mac.c  
include/net/ieee80211softmac.h  
net/core/wireless.c  
net/ieee80211/softmac/ieee80211softmac_assoc.c  
net/ieee80211/softmac/ieee80211softmac_io.c  
net/ieee80211/softmac/ieee80211softmac_module.c  
net/ieee80211/softmac/ieee80211softmac_wx.c

URL: http://gitweb.enneenne.com/?p=linuxpps;a=commit;h=dcf234f3b0cbc4d2b73f5ee02405b117c5d77fbd