John W. Linville 0f2df9eac7 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into merge ...

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-tx.c

2010-04-08 13:34:54 -04:00

..

ipw2100.c

wireless/ipw2x00: remove trailing space in messages

2010-03-31 14:51:37 -04:00

ipw2100.h

ipw2x00: update contact information

2009-08-28 14:40:40 -04:00

ipw2200.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into merge

2010-04-08 13:34:54 -04:00

ipw2200.h

ipw2x00: update contact information

2009-08-28 14:40:40 -04:00

Kconfig

wireless: remove WLAN_80211 and WLAN_PRE80211 from Kconfig

2009-10-30 16:50:35 -04:00

libipw_geo.c

ipw2x00: update contact information

2009-08-28 14:40:40 -04:00

libipw_module.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into merge

2010-04-08 13:34:54 -04:00

libipw_rx.c

libipw: switch from ieee80211_* to libipw_* naming policy

2009-08-28 14:40:28 -04:00

libipw_tx.c

wireless: convert drivers to netdev_tx_t

2009-09-01 01:14:04 -07:00

libipw_wx.c

ipw2x00: update contact information

2009-08-28 14:40:40 -04:00

libipw.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into merge

2010-04-08 13:34:54 -04:00

Makefile

…