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

Trivial merge