Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 7 Feb 2014 18:44:14 +0000 (13:44 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 7 Feb 2014 18:44:14 +0000 (13:44 -0500)
commit0f96b860bc5e97d4776d0cb375c7ca1f4864f9e9
treeef46bd077c1710a0474b5b3b31c543783197a274
parentee262ad827f89e2dc7851ec2986953b5b125c6bc
parent348f7d4adee97f222e3ad9ff97956ca3793d11c6
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem