]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Nov 2013 20:49:02 +0000 (15:49 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Nov 2013 20:49:02 +0000 (15:49 -0500)
commitef97a90dfc9bffeafa00f702ad8f061221dc309d
tree8663ca32b912e8b3df428f570b7fd376aa3aa0cb
parentdb8ab3f7e917bdba1c93eecb4dc8530c27d09397
parentabfa7600b0ea5798ac8f088f2d01b3f35640a27a
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Conflicts:
net/wireless/reg.c
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/status.c
net/mac80211/tx.c
net/mac80211/util.c
net/wireless/ibss.c
net/wireless/nl80211.c