Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 18:39:53 +0000 (14:39 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 18:39:53 +0000 (14:39 -0400)

Trivial merge