Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Jan 2013 19:22:45 +0000 (14:22 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Jan 2013 19:22:45 +0000 (14:22 -0500)

Trivial merge