git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit

author	John W. Linville <linville@tuxdriver.com>
	Fri, 23 Apr 2010 18:43:45 +0000 (14:43 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 23 Apr 2010 18:43:45 +0000 (14:43 -0400)
commit	3b51cc996e81d8a113416d8094fa4a88f8360a51
tree	e75b98b228bb4e456c30673fcc4b56ffa1d09cf5	tree \| snapshot (tar.gz zip)
parent	c68ed255265968c3948fa2678bf59d15c471b055	commit \| diff
parent	672724403b42da1d276c6cf811e8e34d15efd964	commit \| diff

Merge branch 'master' into for-davem

Conflicts:
drivers/net/wireless/ath/ath9k/phy.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-debugfs.c

33 files changed:

drivers/net/wireless/ath/ath5k/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/debug.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/rc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.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.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/orinoco/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/orinoco/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/orinoco/wext.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/p54pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00queue.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/wl1251_main.c	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/driver-ops.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/key.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history

Motorola kernel-slsi

RSS Atom

drivers/net/wireless/ath/ath5k/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/debug.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/rc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.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.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/orinoco/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/orinoco/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/orinoco/wext.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/p54pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00queue.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/wl1251_main.c	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/driver-ops.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/key.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history