]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'for-next/perf' into aarch64/for-next/core
authorWill Deacon <will.deacon@arm.com>
Tue, 24 Oct 2017 15:05:15 +0000 (16:05 +0100)
committerWill Deacon <will.deacon@arm.com>
Tue, 24 Oct 2017 15:06:56 +0000 (16:06 +0100)
Merge in ARM PMU and perf updates for 4.15:

  - Support for the Statistical Profiling Extension
  - Support for Hisilicon's SoC PMU

Signed-off-by: Will Deacon <will.deacon@arm.com>
1  2 
arch/arm64/include/asm/sysreg.h

Simple merge