Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Nov 2012 19:43:51 +0000 (14:43 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Nov 2012 19:43:51 +0000 (14:43 -0500)

Trivial merge