Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 4 Mar 2013 19:24:02 +0000 (14:24 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 4 Mar 2013 19:24:02 +0000 (14:24 -0500)

Trivial merge