| commit | 0215f4cf7284a1f94cff180ff289a0de53c17917 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Apr 14 14:21:07 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Apr 14 14:21:07 2014 -0400 |
| tree | af5ffa291ab46c614e6ba94577bc2331b632bf88 | |
| parent | 08e22e193a0080d53dd0669c4f6422f602bb643c [diff] | |
| parent | a6bc92803e7f765e02c923cf37c8e280e729642a [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes