Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 23 May 2014 14:55:58 +0000 (10:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 23 May 2014 14:55:58 +0000 (10:55 -0400)
commit5ca2504ea36df1da815029a9e9277c08540042eb
tree9a920a20faf1e327c403336f6005126397e31ce7
parentb6ed5498601df40489606dbc14a9c7011c16630b
parent2c316e699fa40f2fc161ebb770b6e2845db4f3b0
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem