commit | 531efffc3e3ff52d732c8fa6f32e084e9c447612 | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Wed May 29 14:50:45 2013 -0400 |
committer | John W. Linville <linville@tuxdriver.com> | Wed May 29 14:50:45 2013 -0400 |
tree | 79c301b2c8b5400a39c95e034764cf7a208a16a2 | |
parent | bbf71a8f35cf52e97ba129401f82ccefd249c757 [diff] | |
parent | b571a69745dc90aec3d0505a7ceac2702a93861b [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next