Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Aug 2013 19:36:55 +0000 (15:36 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Aug 2013 19:36:55 +0000 (15:36 -0400)

Trivial merge