Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 2 May 2014 17:47:50 +0000 (13:47 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 2 May 2014 17:47:50 +0000 (13:47 -0400)
commit406a94d7fae94a893c3afb9c2d18c83124d3cd9b
treec81f4de219ff9309a3f8f60c7855a620b8598ef4
parentc25aaf814a63f9d9c4e45416f13d70ef0aa0be2e
parent48d11dc37977614a461bfedddc52d1c651bc279f
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem