| commit | d819c6cf1c064e74c50e38c3ff36a781bb49959c | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Mon Sep 30 11:02:46 2013 +0200 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Oct 02 10:34:55 2013 -0400 |
| tree | 1387aec7bae1d17c1cac3ccc31afdd5f872cef36 | |
| parent | 772eb433357704ec3d6e0daa727d9ec3e85f50c1 [diff] |
iwlwifi: pcie: fix merge damage The merge b35c8097 seems to have lost commit eabc4ac5d, put the code back. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>