OSDN Git Service

kernel/sys.c: fix merge error with 4.4.144
authorGreg Kroah-Hartman <gregkh@google.com>
Tue, 31 Jul 2018 18:28:27 +0000 (20:28 +0200)
committerGreg Kroah-Hartman <gregkh@google.com>
Tue, 31 Jul 2018 18:28:27 +0000 (20:28 +0200)
commit2241aa98c9aa6b5b5fec1a0ce4af9efb0d9eacdc
treeb61981dc67f3145d613e49db53e32b220e4b2179
parent05670d3d98f96844679f61cad014f74e85446999
kernel/sys.c: fix merge error with 4.4.144

Change-Id: I7b3b8c82b81f465e47a653c71e7d945cd1cd990d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
kernel/sys.c