| commit | 623c43875f496fdd3fc0e6288bd0e06aa2b63c9d | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Dec 18 15:09:58 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Dec 18 15:09:58 2013 -0500 |
| tree | 8479dcd1a8f8f294de0d90a6e96f0ca9741f2383 | |
| parent | 204e35a91c4b3327b7239d7687fbd4923edbbf08 [diff] | |
| parent | cf4ef65446443eb485afe9419ea82b2efbe582a7 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next