diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-09-30 11:02:46 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-07 13:34:43 -0400 |
| commit | d107babca27f3c08e399616483e4c5f010bd24d3 (patch) | |
| tree | 359f12f44cf8cda7c5fb28f5561130403baf88f1 /fs/minix/Kconfig | |
| parent | ec30326ea773900da210c495e14cfeb532550ba2 (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>
Diffstat (limited to 'fs/minix/Kconfig')
0 files changed, 0 insertions, 0 deletions