| commit | 204162296edf0d0ac3e4dfd5bd0cac4af731b583 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Aug 02 15:37:34 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Aug 02 15:37:34 2013 -0400 |
| tree | fdf941fd23fae6097500db4998d4ca96467fc352 | |
| parent | e3d5291436ff9efeeb968459724af5332305dded [diff] | |
| parent | 147fc9be81d10e6e863323c0b54e140b42fd1ed6 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next