Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 14 May 2014 19:39:45 +0000 (15:39 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 14 May 2014 19:39:45 +0000 (15:39 -0400)

Trivial merge