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

Trivial merge