tree 46571db4141e7faa1636b4792c0704ae25799989
parent 7fc942722209208241b7e676e80b5e8a3efd2960
parent 4601879419f94a89fcbf427b4d3bfbf4ce294174
author John W. Linville <linville@tuxdriver.com> 1406047762 -0400
committer John W. Linville <linville@tuxdriver.com> 1406047762 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes