tree 598cb96d4b22749e07116cb4006d71fb5a5704ea
parent 988bf4f01e6a1eefdedd76e961044f01fe6a304c
parent a59b40b30f3f51bf5c56c15a7dc4da11b424a34b
author John W. Linville <linville@tuxdriver.com> 1386253796 -0500
committer John W. Linville <linville@tuxdriver.com> 1386253796 -0500

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