Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 19 Jul 2012 16:35:00 +0000 (12:35 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 19 Jul 2012 16:35:00 +0000 (12:35 -0400)

Trivial merge