| commit | 63c664242d656b8507b10d66e0088e9b640f8906 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Sep 25 15:55:02 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Sep 25 15:55:02 2012 -0400 |
| tree | fc1c0663b6daa73bfbea17d9f3483a097ce1744f | |
| parent | 5419575e838cd2cd11a1b30449eb58decdf51f9f [diff] | |
| parent | 513aa3b0d14be809490d5c151994cc7f047b0718 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next