From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 4 Nov 2014 21:18:12 +0000 (-0500)
Subject: Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: omap-for-v3.19/fixes-rc1~125^2~234^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf515fb11ab539c76d04f0e3c5216ed41f41d81f;p=pandora-kernel.git

Merge tag 'mac80211-next-for-john-2014-11-04' of git://git./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>
---

bf515fb11ab539c76d04f0e3c5216ed41f41d81f
Reading git-diff-tree failed