tree 5d9eff61123f096e2434a9d36e6fdbd4cc5c6292
parent ccdbb6e96beca362db876d820ac1e560ff6d9579
parent b6b561c31d51db3dec0cb55412a5d7a1a2397521
author John W. Linville <linville@tuxdriver.com> 1382032927 -0400
committer John W. Linville <linville@tuxdriver.com> 1382032927 -0400

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