Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/b44.c
Simple merge

diff --cc drivers/net/s2io.c
Simple merge

diff --cc drivers/net/wireless/ipw2100.h
Simple merge

diff --cc drivers/net/wireless/ipw2200.c
index 589aef8ba4e67f766f3b8440ea553816442836c3,136884cef9084b33b1058323cecea93bce605e1a..b0d195d1721a6b490107c864043596d0a0768d10
--- 1/drivers/net/wireless/ipw2200.c
--- 2/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@@ -31,13 -31,14 +31,15 @@@
  ******************************************************************************/
  
  #include "ipw2200.h"
 +#include <linux/version.h>
  
- #define IPW2200_VERSION "1.0.0"
+ #define IPW2200_VERSION "git-1.0.8"
  #define DRV_DESCRIPTION       "Intel(R) PRO/Wireless 2200/2915 Network Driver"
- #define DRV_COPYRIGHT "Copyright(c) 2003-2004 Intel Corporation"
+ #define DRV_COPYRIGHT "Copyright(c) 2003-2005 Intel Corporation"
  #define DRV_VERSION     IPW2200_VERSION
  
+ #define ETH_P_80211_STATS (ETH_P_80211_RAW + 1)
+ 
  MODULE_DESCRIPTION(DRV_DESCRIPTION);
  MODULE_VERSION(DRV_VERSION);
  MODULE_AUTHOR(DRV_COPYRIGHT);

diff --cc drivers/net/wireless/ipw2200.h
Simple merge

diff --cc drivers/net/wireless/prism54/isl_38xx.c
Simple merge

diff --cc drivers/net/wireless/prism54/islpci_eth.c
Simple merge