Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

projects / firefly-linux-kernel-4.4.55.git / commit

author	John W. Linville <linville@tuxdriver.com>
	Mon, 28 Jan 2013 18:54:03 +0000 (13:54 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 28 Jan 2013 18:54:03 +0000 (13:54 -0500)
commit	9ebea3829fac7505e0cd2642fbd13cfa9c038831
tree	ed690568a27b7231b8a507e8ba07c1ae34868e5c	tree \| snapshot
parent	c5e818ef081c4144177fdbdeed154332cd7e4d7a	commit \| diff
parent	83f0c6d1f502bd75bb4a9e31e8d64e59c6894ad1	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/iwlwifi/dvm/tx.c

29 files changed:

drivers/net/wireless/ath/ath9k/ar9003_calib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/beacon.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/debug.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/debug.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/3945-mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192de/trx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192se/trx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8723ae/trx.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/Kconfig	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh_hwmp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/offchannel.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

drivers/net/wireless/ath/ath9k/ar9003_calib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/beacon.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/debug.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/debug.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/3945-mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192de/trx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192se/trx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8723ae/trx.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/Kconfig	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh_hwmp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/offchannel.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history