| commit | eb2eacf77ec4828c9a2e451b06bc6fc44266f4c0 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Sep 15 14:37:07 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Sep 15 14:37:07 2014 -0400 |
| tree | 32d6aff5b5c67649e3ca81e0aa9322f206224aaf | |
| parent | 167bf96dd87d2a8360cb9e9783006876dac4f579 [diff] | |
| parent | f991e17ba2584e2be66476cc468f19769efd55cc [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next