Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 2 Aug 2013 18:54:19 +0000 (14:54 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 2 Aug 2013 18:54:19 +0000 (14:54 -0400)

Trivial merge