| commit | 209f6c37540a6cc1c74333a7ede0da729488a8cd | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue May 13 14:52:34 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue May 13 14:52:34 2014 -0400 |
| tree | e7c040198825b713b1b5b8d467e06d45d1faf6a1 | |
| parent | 03e5da151b8e390f2e28c4edf8fbbb6ca6d7a7ed [diff] | |
| parent | b538b8ce76f69f7fa225bc0817bbb361b877ea23 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes