| commit | 24de851b79a414f0e1813eb131a7d90849cc22c2 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Aug 16 14:48:40 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Aug 16 14:48:40 2013 -0400 |
| tree | 4da554a6d83adbfea3e00e242f97028a69cc0bb7 | |
| parent | d0746663667f37e7be5646bf68cb452c8375a23d [diff] | |
| parent | 89716344806bd49d213ad5960661e8c2d38c4982 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next