Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.

diff --cc include/linux/etherdevice.h
Simple merge

diff --cc net/Kconfig
index 8a12ea8,2684e80..3ae4a47
--- 1/net/Kconfig
--- 2/net/Kconfig
+++ b/net/Kconfig
@@@ -635,14 -226,9 +226,10 @@@ config NET_POLL_CONTROLLE
        def_bool NETPOLL
  
  source "net/ax25/Kconfig"
- 
  source "net/irda/Kconfig"
- 
  source "net/bluetooth/Kconfig"
- 
 +source "net/ieee80211/Kconfig"
  
- source "drivers/net/Kconfig"
- 
- endmenu
+ endif   # if NET
+ endmenu # Networking