]> 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)
commit6a11e66073acaefbde374d0e55a46b8973e429db
tree8663ca32b912e8b3df428f570b7fd376aa3aa0cb
parent13ec7c5bb2e6f53aacd3728613028edd0f80840d
parent8ce08b8e749347129819426f4eda27a747897183
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