Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 23 Aug 2012 13:49:42 +0000 (09:49 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 23 Aug 2012 13:49:42 +0000 (09:49 -0400)

Trivial merge