Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Jan 2013 20:22:52 +0000 (15:22 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Jan 2013 20:22:52 +0000 (15:22 -0500)

Trivial merge