Thomas Petazzoni 09c989420d linux: fix up bad merge conflict ...

Fix commit 400eaa3452 ("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>

2017-02-20 22:02:52 +01:00

..

0001-timeconst.pl-Eliminate-Perl-warning.patch.conditional

linux: add conditional patch for timeconst.pl

2016-02-10 08:12:57 +01:00

Config.ext.in

linux: add ev3dev extension

2016-11-02 17:52:24 +01:00

Config.in

linux: fix up bad merge conflict

2017-02-20 22:02:52 +01:00

linux-ext-aufs.mk

aufs: new kernel extension

2016-09-20 19:03:46 +02:00

linux-ext-ev3dev-linux-drivers.mk

linux: add ev3dev extension

2016-11-02 17:52:24 +01:00

linux-ext-fbtft.mk

linux: fix fbtft kernel extension

2015-04-09 23:26:16 +02:00

linux-ext-rtai.mk

rtai: remove option BR2_LINUX_KERNEL_EXT_RTAI_PATCH

2015-04-22 22:12:15 +02:00

linux-ext-xenomai.mk

linux: migrate extensions to use the new infrastructure

2015-04-09 23:00:01 +02:00

linux.mk

linux: check that a repo and version is defined when using a custom repo

2016-12-17 15:55:32 +01:00