Merge 4.14.101 into android-4.14-p
authorGreg Kroah-Hartman <gregkh@google.com>
Fri, 15 Feb 2019 09:12:58 +0000 (10:12 +0100)
committerGreg Kroah-Hartman <gregkh@google.com>
Fri, 15 Feb 2019 09:12:58 +0000 (10:12 +0100)
Changes in 4.14.101
Revert "exec: load_script: don't blindly truncate shebang string"
Linux 4.14.101

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
1  2 
Makefile

diff --cc Makefile
Simple merge