Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Dec 2012 21:04:03 +0000 (16:04 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Dec 2012 21:04:03 +0000 (16:04 -0500)

Trivial merge