git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 14f1b33 b76cb2a)

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	bb1efd63ac7f14c919c9e9d9dfab3bb01fa68c12
tree	0e831639cd6449c2955234cfc37ef46481c788d1	tree \| snapshot
parent	14f1b337e7b9ea50c1e2eb836f845e80a9f1f111	commit \| diff
parent	b76cb2adc5e6b1acb30026822c8b7b08fb3a25dc	commit \| diff

Merge branch 'for-john' of git://git.kernel.org/pub/scm/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

Linux Kernel Source Tree.