Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Mar 2014 18:09:47 +0000 (14:09 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Mar 2014 18:09:47 +0000 (14:09 -0400)
commit8c35743fdc3c013cbb9832dc9c5eb04362b86cbb
tree2bd87f451ce6b82521336f9e9be6e0d82edd39c0
parentc60f7d5a8e7c639de5d9dfe07e1e91d302d506e4
parent584221918925f0d3bbc8ff6de9cfdb703c06a29c
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem