Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 7 Sep 2012 18:49:46 +0000 (14:49 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 7 Sep 2012 18:49:46 +0000 (14:49 -0400)

Trivial merge