Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Jul 2013 18:46:51 +0000 (14:46 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Jul 2013 18:46:51 +0000 (14:46 -0400)

Trivial merge