summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-06 11:40:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-06 11:40:24 -0700
commit18fb92c30c766a5fb4593ecd0d9155b33d139e8e (patch)
treee644bd8491eddfec47ced2d3543c92fb84dfaee5 /crypto
parentcade818463f8ae47e19466c2fe321fe30c3fe57e (diff)
parent8482716b9d865db34c55d4bf2fed19498e7195b9 (diff)
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar: "This tree contains two fixes: new Intel CPU model numbers and an AMD/iommu uncore PMU driver fix" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/amd/iommu: Do not register a task ctx for uncore like PMUs perf/x86: Add model numbers for Kabylake CPUs
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions