diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-22 22:08:29 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-22 22:08:29 +0300 |
| commit | ae0008c71a192abe6f0fed7082d5e5b1cadfd4e7 (patch) | |
| tree | 2bef14ef257315aac5502a5d3f90a3417e938182 | |
| parent | 917d083d48f50537b21c8761e2366bf229ed9f5d (diff) | |
| parent | a006827a152c3f4d09324157096c8f89cf7ddca3 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next