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: 39fae17 5122698)

author	John W. Linville <linville@tuxdriver.com>
	Fri, 9 Aug 2013 19:06:28 +0000 (15:06 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 9 Aug 2013 19:06:28 +0000 (15:06 -0400)
commit	9cbd535b4f8c7149d52e6e58948aeaa1263850ef
tree	69e71db0cf005a68ab1b70f33ae0462fd94152fc	tree \| snapshot
parent	39fae177e4b59166d5ef6b9b95efa84d544769cf	commit \| diff
parent	5122698eb55e1258605bdbb4d2231dcc4e9451f4	commit \| diff

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

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/4965-mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/d3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/sta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/join.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_ioctl.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.