Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 17:56:34 +0000 (13:56 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 17:56:34 +0000 (13:56 -0400)

Trivial merge