| commit | 0eeb315b20774296f977cecf0010794cd690c594 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Jul 22 12:49:22 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Jul 22 12:49:22 2014 -0400 |
| tree | 46571db4141e7faa1636b4792c0704ae25799989 | |
| parent | 7fc942722209208241b7e676e80b5e8a3efd2960 [diff] | |
| parent | 4601879419f94a89fcbf427b4d3bfbf4ce294174 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes