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

Trivial merge