| commit | c3c5bb31ea046721bc5fe3e54b45c7a13677f398 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Jan 03 15:34:41 2014 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Jan 03 15:34:41 2014 -0500 |
| tree | e924df7c6d1834e2fd5079d5c424c0a3f070f490 | |
| parent | 55d1cad2efe2e3567c3116f50ba10e5af1bc01fc [diff] | |
| parent | 14648d6534477952633ee3ecadb31cf227414f13 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next