From: Emmanuel Grumbach Date: Sun, 16 Mar 2014 06:51:47 +0000 (+0200) Subject: iwlwifi: mvm: fix merge damage X-Git-Tag: v3.15-rc1~113^2~93^2^2~12^2~18 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=833df4a81d06830bd4d24ad26b76656f62d5fac1;p=pandora-kernel.git iwlwifi: mvm: fix merge damage Scheduled scan was disabled because it was broken. Now it is fixed and got disabled by mistake by a merge. Signed-off-by: Emmanuel Grumbach --- Reading git-diff-tree failed