summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/perf_event.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-28 19:59:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-28 19:59:17 -0700
commit2113caed87dd372e5ca2d9b3cba415f4da38936b (patch)
treea8ce1b6b1653323e11d7152f2900f66bbd4bdca4 /arch/x86/include/asm/perf_event.h
parent8f3603a210970d665e7cecf6623331ce6b24f713 (diff)
parent75dd602a5198a6e5f75534db52b6e6fbaabb33d1 (diff)
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar: "Two lockdep fixes" * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: lockdep: Fix lock_chain::base size locking/lockdep: Fix ->irq_context calculation
Diffstat (limited to 'arch/x86/include/asm/perf_event.h')
0 files changed, 0 insertions, 0 deletions