| commit | fd2841c5b59c276796f730b77ef37408c0909f9c | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Jul 09 16:35:18 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Jul 09 16:35:18 2012 -0400 |
| tree | 34329300850e4addad576325840b6715e6894a9a | |
| parent | 0af5491c2f6069bb6cff4260619749a90a208c98 [diff] | |
| parent | 0ff1bd35f5aece42879b04cbfe6b4040cf50a697 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next