| commit | b88bb291b21f364c5441bdbf8195502bc75e6b47 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu May 22 14:01:43 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu May 22 14:01:43 2014 -0400 |
| tree | fb0c59e70c92e60f7c733f0005f61bad93acb8d3 | |
| parent | 40a10fd740a4d5a9f3da255cf8dae48c6723d1a6 [diff] | |
| parent | 999609f1206a14039db534058b251c6d5ab39322 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next