| commit | d878b3af675da14917a249e33addb789d54d3094 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Jul 23 13:06:17 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Jul 23 13:06:17 2014 -0400 |
| tree | 10c02a67e231993f74ab32bc0cdb51a74643b48e | |
| parent | 16e754535a69152c12494da18eb3ea7947f5a434 [diff] | |
| parent | f697267f827516fba4d0c325ed1db1e72f402f11 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next