Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 1 Feb 2013 18:43:25 +0000 (13:43 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 1 Feb 2013 18:43:25 +0000 (13:43 -0500)

Trivial merge