| commit | 2c316e699fa40f2fc161ebb770b6e2845db4f3b0 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu May 22 13:53:27 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu May 22 13:53:27 2014 -0400 |
| tree | 6dce3aa33e10f92e9df01521daea72367084683e | |
| parent | 20b4f9c73ff4137d720c4f378e1a780ac6a6c04d [diff] | |
| parent | 7bacc782270ff7db3b9f29fa5d24ad2ee1e8e81d [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes