Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Jul 2014 16:55:45 +0000 (12:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Jul 2014 16:55:45 +0000 (12:55 -0400)

Trivial merge