Merge 4.14.46 into android-4.14
authorGreg Kroah-Hartman <gregkh@google.com>
Wed, 30 May 2018 20:48:32 +0000 (22:48 +0200)
committerGreg Kroah-Hartman <gregkh@google.com>
Wed, 30 May 2018 20:48:32 +0000 (22:48 +0200)
Changes in 4.14.46
perf tools: Add trace/beauty/generated/ into .gitignore
tools: sync up .h files with the repective arch and uapi .h files
Revert "perf record: Fix crash in pipe mode"
Linux 4.14.46

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

diff --cc Makefile
Simple merge