Merge tag 'v4.4.142' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.4-stable

[email protected] Fri, 31 Aug 2018 03:32:46 +0200

Newsgroups	gmane.linux.ports.mips.cvs
Message-ID	<S23994612AbeHaBcsjZUE2/[email protected]>

Author: Ralf Baechle <[email protected]> Fri Aug 31 02:30:31 2018 +0200
Commit: af0b464e3c64c7e5f15cfd99d04cbd434bdb8cf3
Gitweb: https://git.linux-mips.org/g/ralf/linux/af0b464e3c64
Branch: linux-4.4-stable

---

 Makefile                                |    2 +-
 arch/x86/kernel/cpu/common.c            |    7 ++++---
 scripts/Kbuild.include                  |    5 +++--
 tools/arch/x86/include/asm/unistd_32.h  |    9 +++++++++
 tools/arch/x86/include/asm/unistd_64.h  |    9 +++++++++
 tools/build/Build.include               |    5 +++--
 tools/perf/config/Makefile              |    1 +
 tools/perf/perf-sys.h                   |   18 ------------------
 tools/perf/util/include/asm/unistd_32.h |    1 -
 tools/perf/util/include/asm/unistd_64.h |    1 -
 tools/scripts/Makefile.include          |    2 ++
 11 files changed, 32 insertions(+), 28 deletions(-)