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

Trivial merge