tree c81f4de219ff9309a3f8f60c7855a620b8598ef4
parent c25aaf814a63f9d9c4e45416f13d70ef0aa0be2e
parent 48d11dc37977614a461bfedddc52d1c651bc279f
author John W. Linville <linville@tuxdriver.com> 1399052870 -0400
committer John W. Linville <linville@tuxdriver.com> 1399052870 -0400

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