Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 22 May 2014 17:58:36 +0000 (13:58 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 22 May 2014 17:58:36 +0000 (13:58 -0400)

Trivial merge