| commit | d9a577c35a5f874cb11d96993dec26775e9738f7 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Dec 11 10:49:24 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Dec 11 10:49:24 2013 -0500 |
| tree | d993d7e3ff97e4ef9b082c950c8becd85d24eb92 | |
| parent | d6b5075d73adbc10fac873ca86798e30c115a018 [diff] | |
| parent | 9d10849e4ea8bf9d8da80afa73918a9fe45c09ef [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next