Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Jun 2013 18:26:48 +0000 (14:26 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Jun 2013 18:26:48 +0000 (14:26 -0400)

Trivial merge