Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 20 Mar 2014 15:53:20 +0000 (11:53 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 20 Mar 2014 15:53:20 +0000 (11:53 -0400)

Trivial merge