diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-28 20:46:00 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-28 20:46:00 +0100 |
commit | f89db789de2157441d3b5e879a742437ed69cbbc (patch) | |
tree | ab768dbb16c3c5c078d9721fee28d1b2b2508392 /arch/arm/mach-shmobile/platsmp-scu.c | |
parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | Merge branches 'x86/cache', 'x86/debug' and 'x86/irq' into x86/urgent (diff) | |
download | linux-f89db789de2157441d3b5e879a742437ed69cbbc.tar.xz linux-f89db789de2157441d3b5e879a742437ed69cbbc.zip |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Two documentation updates, plus a debugging annotation fix"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/crash: Update the stale comment in reserve_crashkernel()
x86/irq, trace: Add __irq_entry annotation to x86's platform IRQ handlers
Documentation, x86, resctrl: Recommend locking for resctrlfs
Diffstat (limited to 'arch/arm/mach-shmobile/platsmp-scu.c')
0 files changed, 0 insertions, 0 deletions