Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 6 Jun 2014 15:59:11 +0000 (11:59 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 6 Jun 2014 15:59:11 +0000 (11:59 -0400)
commitc6ac68a612783aab0aad62b8edd36791b251aadb
tree348e65496111cd7b40365ffd78fcbe7bd2f9a58d
parent9e89fd8b7db71038fd9f70f34e210963fa8fc980
parentc678de55361aa5b72b1aaa495380a395b8cc1bd2
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem