| commit | 25da0cd4233dbc3dbf8adbd7a357d00a9e796f40 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue May 28 13:39:40 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue May 28 13:39:40 2013 -0400 |
| tree | e054d7f78266eda7ac0a7d0fde36d87ac6bb80b0 | |
| parent | d61bdbf1235b7a11b29197b538bbee41855eaf38 [diff] | |
| parent | a87783699b23395c46bbeeb5d28f6db24897bf26 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes