Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Author: Ralf Baechle <[email protected]> Tue Jun 6 11:48:40 2017 +0200
Commit: 3ed77653712a79282948051e82ac7d175ce1681b
Gitweb: https://git.linux-mips.org/g/ralf/linux/3ed77653712a
Branch: master

---

 arch/arm/boot/compressed/efi-header.S |    4 +--
 arch/arm/boot/compressed/head.S       |   17 +++++++++------
 arch/arm/common/mcpm_entry.c          |    6 +++--
 arch/arm/include/asm/pgtable-nommu.h  |    1 +
 drivers/ata/ahci.c                    |   38 +++++++++++++++++++++++++++++++++
 drivers/ata/libahci_platform.c        |    5 +++-
 drivers/ata/libata-core.c             |    2 +-
 drivers/ata/sata_mv.c                 |   13 +++++++----
 drivers/ata/sata_rcar.c               |   15 ++++++++++---
 include/linux/cgroup-defs.h           |    1 +
 include/linux/cgroup.h                |   20 +++++++++++++++++
 kernel/cgroup/cgroup.c                |    5 ++++
 kernel/cgroup/cpuset.c                |    4 ++-
 13 files changed, 105 insertions(+), 26 deletions(-)