Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Jun 2013 18:44:59 +0000 (14:44 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Jun 2013 18:44:59 +0000 (14:44 -0400)

Trivial merge