Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 6 Dec 2012 19:58:41 +0000 (14:58 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 6 Dec 2012 19:58:41 +0000 (14:58 -0500)
commit403e16731ffddc097eae89f53f9a7b0f0c9769c4
tree228d17985ad8ea22a7763457bf9641eb44781568
parent55cb0797fa779e36f62876a8aa44cbf3984e8d59
parentda29d2a5780d80857773d7776b7603a449b0b6e0
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next

Conflicts:
drivers/net/wireless/mwifiex/sta_ioctl.c
net/mac80211/scan.c
drivers/net/wireless/mwifiex/sta_ioctl.c
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/main.c
net/mac80211/scan.c
net/mac80211/status.c
net/mac80211/tx.c
net/mac80211/util.c
net/wireless/reg.c