Commits

Thomas Petazzoni committed 09c989420db
linux: fix up bad merge conflict Fix commit 400eaa3452e9380ec77ac62266530055506ea6e7 ("linux: bump default to version 4.10") in which a conflict was not correctly resolved. Reported-by: Romain Naour <romain.naour@smile.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>