Fix merge(to keep source clean)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
	Documentation/isdn/README.gigaset
	drivers/net/atl1c/atl1c.h
	drivers/net/atl1c/atl1c_main.c
	drivers/net/gianfar.c
	drivers/net/ixgbe/ixgbe_main.c
	drivers/net/netxen/netxen_nic_init.c
	drivers/net/wireless/ath/ath5k/eeprom.c
	drivers/net/wireless/ath/ath9k/mac.c
	drivers/net/wireless/ath/ath9k/xmit.c
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/iwlwifi/iwl-3945.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-csr.h
	drivers/net/wireless/iwlwifi/iwl-eeprom.c
	drivers/net/wireless/iwlwifi/iwl-hcmd.c
	drivers/net/wireless/iwlwifi/iwl-rx.c
	drivers/net/wireless/iwlwifi/iwl-scan.c
	drivers/net/wireless/iwlwifi/iwl-sta.c
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
	drivers/net/wireless/iwmc3200wifi/iwm.h
	drivers/net/wireless/iwmc3200wifi/netdev.c
	drivers/net/wireless/iwmc3200wifi/rx.c
	drivers/net/wireless/mwl8k.c
	drivers/net/wireless/rt2x00/rt2800.h
	drivers/net/wireless/rt2x00/rt2800lib.c
	drivers/net/wireless/rt2x00/rt61pci.c
	include/net/inet_timewait_sock.h
	include/net/tcp.h
	net/ipv4/inet_hashtables.c
	net/ipv4/inet_timewait_sock.c
	net/ipv4/tcp.c
	net/mac80211/rx.c
	net/rfkill/core.c
	net/wireless/wext-compat.c