]> git.karo-electronics.de Git - linux-beck.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Aug 2013 14:36:09 +0000 (10:36 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Aug 2013 14:36:09 +0000 (10:36 -0400)
commitb35c809708ad245a36bef94d6fb1e83f6ab850aa
treec6dc6580546c9a5997eae06c8409f986c383d2a4
parent6e956da2027c767859128b9bfef085cf2a8e233b
parent19c361608ce3e73f352e323262f7e0a8264be3af
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
net/mac80211/ibss.c
12 files changed:
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/iwlegacy/4965-mac.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/time-event.c
drivers/net/wireless/iwlwifi/pcie/rx.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/zd1201.c
include/net/mac80211.h
net/mac80211/ibss.c
net/mac80211/rc80211_minstrel_ht.c
net/wireless/nl80211.c