| commit | aa3c90b89045b532418feb3eca6ca258920bf702 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Jan 22 15:39:51 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Jan 22 15:39:51 2013 -0500 |
| tree | e7b044fc01740983d342238dc6f927170f41c978 | |
| parent | 660b9caaad380758c756a7e60397e33dab44fe3f [diff] | |
| parent | 1c3fea82d6ebf33edadefed2d9ce3efa1a654338 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next