Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Oct 2012 14:32:13 +0000 (10:32 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Oct 2012 14:32:13 +0000 (10:32 -0400)
commit330ee00412bbaefa7d0597a1bed7804e818ba91c
tree0d086857f4e704f4945463e87e76ebf8ae32cad8
parent3da3fff8006c608f19a51859d44ba47ca8b41461
parentf89ff6441df06abc2d95f3ef67525923032d6283
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem