| commit | d72c728210fa803a21203360c0f40b32972d795a | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Apr 10 14:10:24 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Apr 10 14:10:24 2013 -0400 |
| tree | 95189c1a9181e3317dea2a139f390f5013e921a2 | |
| parent | 655d8e2328a6ef6b6b514609a4c1e33508d3a1da [diff] | |
| parent | 2d055afdcada4bd8b510e9d2a8566fbded3c9696 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next