From: Greg Kroah-Hartman <gregkh@google.com>
Date: Wed, 30 May 2018 20:48:32 +0000 (+0200)
Subject: Merge 4.14.46 into android-4.14
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8c9ae76451dd74e200522d0e57e029320064437c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

8c9ae76451dd74e200522d0e57e029320064437c