| commit | 41effc2a6c6548f1dc6b749f09c646d931c309a4 | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Wed Mar 06 16:46:25 2013 +0100 |
| committer | Johannes Berg <johannes.berg@intel.com> | Wed Mar 06 16:46:43 2013 +0100 |
| tree | d99a5da02df4e4ab06a251dcd3960c153cbfd037 | |
| parent | 6dbe51c251a327e012439c4772097a13df43c5b8 [diff] | |
| parent | 2470b36e84a2e680d7a7e3809cbceae5bfae3606 [diff] |
Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD This is needed to resolve some conflicts that would otherwise happen between wireless-next and the code here. Signed-off-by: Johannes Berg <johannes.berg@intel.com>