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)
commit353c78152c10027b8da5de446bad3472f977fcdc
tree8663ca32b912e8b3df428f570b7fd376aa3aa0cb
parent01925efdf7e03b4b803b5c9f985163d687f7f017
parentd0a361a5b3f5aa28778a0c336de5a911fc0cd678
Merge branch 'for-john' of git://git./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