Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Jan 2013 21:05:14 +0000 (16:05 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Jan 2013 21:05:14 +0000 (16:05 -0500)

Trivial merge