Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 27 May 2014 17:47:27 +0000 (13:47 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 27 May 2014 17:47:27 +0000 (13:47 -0400)
commit03c4444650969431b3a5effde4995de767e3013a
treebe95969287c7005d2e384d77c0ba2a071e13a260
parentef1b075c15d55c71200c63450756a9bb51ce2a60
parent2c316e699fa40f2fc161ebb770b6e2845db4f3b0
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
include/uapi/linux/nl80211.h
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c