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)
commit8c9ae76451dd74e200522d0e57e029320064437c
treee1695c4f1181a840b1c9be325e1b2a29e5a9a1a0
parent84057b58ca77f70af1f0ae1f3922f50c3c10c417
parentbf4367d790c514490896f29085d9fa3defa28513
Merge 4.14.46 into android-4.14

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>
Makefile