| commit | ecbbec2eb093d2ef205de371af986f0360fca539 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Dec 11 16:03:03 2012 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Dec 11 16:03:03 2012 -0500 |
| tree | 57ab3b0c684f957aee568230fadb32995e00da6b | |
| parent | 36b07d15a656b657beaf9e6357a341768192fad2 [diff] | |
| parent | 25a172655f837bdb032e451f95441bb4acec51bb [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next