git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	John W. Linville <linville@tuxdriver.com>
	Wed, 10 Apr 2013 18:09:54 +0000 (14:09 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 10 Apr 2013 18:09:54 +0000 (14:09 -0400)
commit	655d8e2328a6ef6b6b514609a4c1e33508d3a1da
tree	144b686bf3fd6512a55987da2d911f739646ce02	tree \| snapshot
parent	6fe5468f452c0c40348ebd4e737758a842286ca8	commit \| diff
parent	ddc4db2e3d5393ede7a9222bb3b7522a603a4678	commit \| diff

Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next

Conflicts:
drivers/net/wireless/ath/carl9170/debug.c
drivers/net/wireless/ath/carl9170/main.c
net/mac80211/ieee80211_i.h

37 files changed:

drivers/net/wireless/ath/ath9k/calib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/link.c	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/debug.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/b43.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/phy_ht.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/phy_n.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/4965-rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/rxon.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt61pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8188ee/trx.c	diff1 \|	\|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192cu/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/net/wireless/ti/wlcore/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/chan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/offchannel.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

drivers/net/wireless/ath/ath9k/calib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/link.c	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/debug.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/b43.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/phy_ht.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/phy_n.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/4965-rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/rxon.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt61pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8188ee/trx.c	diff1 \|	\|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192cu/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/net/wireless/ti/wlcore/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/chan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/offchannel.c	diff1 \|	diff2 \|	blob \| history