tree eb20de947bec8133d27f97f7af8ae4cf35def663
parent 4c1d8d0617a39c8325a7c2fd80ac14bf40fd8cc6
parent 0d4e67174b03e3dcfe75ce7ec488770a5d443bf4
author John W. Linville <linville@tuxdriver.com> 1363807497 -0400
committer John W. Linville <linville@tuxdriver.com> 1363807497 -0400

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