| commit | dc70a292dab714f02c3012bddaee83a672df7656 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Jun 25 14:20:22 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Jun 25 14:20:22 2014 -0400 |
| tree | c3b6cf9ac486c5618670449860aad20acada47f9 | |
| parent | 12307e420864eb99a648dae84dd3888959885d97 [diff] | |
| parent | a42c9fcc4a88cdd246fab3bcf06c4487afee3d88 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes