git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e4cb3ff ec81608)

author	John W. Linville <linville@tuxdriver.com>
	Mon, 26 Nov 2012 19:46:41 +0000 (14:46 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 26 Nov 2012 19:46:41 +0000 (14:46 -0500)
commit	62c8003ecb973986958e9dade4a7e598349caf48
tree	0e831639cd6449c2955234cfc37ef46481c788d1	tree \| snapshot
parent	e4cb3ff9311e0817e65cda7bc53898348aab7527	commit \| diff
parent	ec816087e8978b74c1bd5fae0e335dd97d964e9f	commit \| diff

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

16 files changed:

drivers/net/wireless/ath/ath6kl/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath6kl/wmi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_event.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_ioctl.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ibss.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.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

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