tree 119c5bb9e513c8205efed485c2dc7b8271123326
parent cf84eb0b09c0f09b4c70a648b9dfeec78be61f07
parent e4e19c031901e95dc7d1cf0a2c9c50525d71651f
author John W. Linville <linville@tuxdriver.com> 1389987797 -0500
committer John W. Linville <linville@tuxdriver.com> 1389987797 -0500

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