review.tizen.org Git - kernel/kernel-generic.git/commit

projects / kernel / kernel-generic.git / commit

author	John W. Linville <linville@tuxdriver.com>
	Thu, 8 Apr 2010 17:34:54 +0000 (13:34 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Thu, 8 Apr 2010 17:34:54 +0000 (13:34 -0400)
commit	0f2df9eac70423838a1f8d410fd3899ddd88317b
tree	0617f723320d83eca5cef9c964c001014e74213f	tree \| snapshot
parent	8c11e4ab09ffb975a89802dde0e9aa52a53b8aa5	commit \| diff
parent	1144601118507f8b3b676a9a392584d216d3f2cc	commit \| diff

Merge branch 'master' of git://git./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

29 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/reset.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/libipw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/libipw_module.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-4965.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rndis_wlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2500usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800lib.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/debugfs_netdev.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;

RSS Atom

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/reset.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/libipw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/libipw_module.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-4965.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rndis_wlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2500usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800lib.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/debugfs_netdev.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history