summaryrefslogtreecommitdiff
path: root/include/linux/input
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-11-05 00:18:12 +0300
committerJohn W. Linville <linville@tuxdriver.com>2014-11-05 00:18:12 +0300
commitbf515fb11ab539c76d04f0e3c5216ed41f41d81f (patch)
tree6aaa226c2a40f90a649561b4a5bb0d1772b20bf1 /include/linux/input
parent6bc6c49f1e2f3ab1bec05d1c08aad219ab4eb5d0 (diff)
parentcf2c92d840c1424bcb3bb501147c79c9b067ad77 (diff)
downloadlinux-bf515fb11ab539c76d04f0e3c5216ed41f41d81f.tar.xz
Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg <johannes@sipsolutions.net> says: "This relatively large batch of changes is comprised of the following: * large mac80211-hwsim changes from Ben, Jukka and a bit myself * OCB/WAVE/11p support from Rostislav on behalf of the Czech Technical University in Prague and Volkswagen Group Research * minstrel VHT work from Karl * more CSA work from Luca * WMM admission control support in mac80211 (myself) * various smaller fixes, spelling corrections, and minor API additions" Conflicts: drivers/net/wireless/ath/wil6210/cfg80211.c Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux/input')
0 files changed, 0 insertions, 0 deletions