| commit | 0d770a82ad8a46b12d706cf11cd11e274fe92302 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu May 08 11:36:40 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu May 08 11:36:40 2014 -0400 |
| tree | 27447232a00683077b5495029d868176a63a0706 | |
| parent | d294d0286af8afbb714e046a7cb9caa4c44fe133 [diff] | |
| parent | 017a64161f6d082f6e3ed85646217bd7217af15a [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next