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

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0d770a8 209f6c3)

author	John W. Linville <linville@tuxdriver.com>
	Tue, 13 May 2014 19:27:44 +0000 (15:27 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 13 May 2014 19:27:44 +0000 (15:27 -0400)
commit	3231d65ffe36e177caf5006d4079867d9b7b2d4a
tree	375c625573387973b4d03ca80eaed2477490fc8b	tree \| snapshot
parent	0d770a82ad8a46b12d706cf11cd11e274fe92302	commit \| diff
parent	209f6c37540a6cc1c74333a7ede0da729488a8cd	commit \| diff

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

18 files changed:

drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mvm.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/utils.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_conn.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_event.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history

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