Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Jul 2012 20:34:39 +0000 (16:34 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Jul 2012 20:34:39 +0000 (16:34 -0400)

Trivial merge