tree 60326e5943997bb72aaf2a375f8a20c61ec7bbcd
parent 7f2e6a5d8608d0353b017a0fe15502307593734e
parent 7a5f799becc51c842ec1a3aeb8dd82651aea7036
author John W. Linville <linville@tuxdriver.com> 1347645229 -0400
committer John W. Linville <linville@tuxdriver.com> 1347645229 -0400

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