From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 22 Jul 2014 17:49:34 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
X-Git-Tag: v3.17-rc1~106^2~12^2~62
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=a006827a152c3f4d09324157096c8f89cf7ddca3;p=cascardo%2Flinux.git

Merge git://git./linux/kernel/git/jberg/mac80211-next
---

a006827a152c3f4d09324157096c8f89cf7ddca3