tree a17982638b066ae29f8ab1a6e37f18e6dddb5272
parent 96b2e73c5471542cb9c622c4360716684f8797ed
parent a715c7ddd65a1a3b2839b8ebd759bb2d361f7675
author John W. Linville <linville@tuxdriver.com> 1401722417 -0400
committer John W. Linville <linville@tuxdriver.com> 1401722417 -0400

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