Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 3 Mar 2014 19:34:45 +0000 (14:34 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 3 Mar 2014 19:34:45 +0000 (14:34 -0500)
commitaf66569efc1ae9c757b5b69019e06eae1020433c
treeacf4cfcd93c103db52086bd5397b64aa3b828c7a
parent9cd95f2a9c1a42df72dea7471b80df1d7611a51a
parent9cdfac446f3b926edb4323895d3f14dee9a1b034
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem