Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 1 Aug 2013 19:26:52 +0000 (15:26 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 1 Aug 2013 19:26:52 +0000 (15:26 -0400)

Trivial merge