From: Luis R. Rodriguez Date: Tue, 5 Nov 2013 17:18:07 +0000 (-0800) Subject: cfg80211: process non country IE conflicting first X-Git-Tag: v3.14-rc1~94^2~334^2^2~132 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f1c6c572d7b;p=pandora-kernel.git cfg80211: process non country IE conflicting first By dealing with non country IE conficts first we can shift the code that deals with the conflict to the left. This has no functional changes. Signed-off-by: Luis R. Rodriguez Signed-off-by: Johannes Berg --- Reading git-diff-tree failed