projects / buildroot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6c5ffa2) | patch
linux: fix up bad merge conflict
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Mon, 20 Feb 2017 21:02:52 +0000 (22:02 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Mon, 20 Feb 2017 21:02:52 +0000 (22:02 +0100)
commit09c989420db1599c7650ae614c672ea5e699d641
tree8182d9811f6a83348a1a4b033d183aef916e3352tree
parent6c5ffa24fa981d3cc01c33dc1db20d24048fdbdacommit | diff
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>
linux/Config.in diff | blob | history