Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 15 Feb 2013 18:59:53 +0000 (13:59 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 15 Feb 2013 18:59:53 +0000 (13:59 -0500)

Trivial merge