tree 9a920a20faf1e327c403336f6005126397e31ce7
parent b6ed5498601df40489606dbc14a9c7011c16630b
parent 2c316e699fa40f2fc161ebb770b6e2845db4f3b0
author John W. Linville <linville@tuxdriver.com> 1400856958 -0400
committer John W. Linville <linville@tuxdriver.com> 1400856958 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem