Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 8 Apr 2013 18:26:57 +0000 (14:26 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 8 Apr 2013 18:26:57 +0000 (14:26 -0400)

Trivial merge