| commit | cb180840a0c6bff7c0787373c23cefdf20417a27 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Jun 12 15:12:41 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Jun 12 15:12:41 2013 -0400 |
| tree | b291b4df78fe08c35297271163b71fd86350a53c | |
| parent | 5631becbb8703d73239e097d222b183aa4f24e40 [diff] | |
| parent | 8eb3871076875f247483f4a1fe6713e6d440c53e [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next