summaryrefslogtreecommitdiff
path: root/kernel/trace/trace_nop.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-25 18:03:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-25 18:03:34 -0700
commita12183c62717ac4579319189a00f5883a18dff08 (patch)
treecad09026a6987c710f1bbfc38730f5e0f0d0796d /kernel/trace/trace_nop.c
parent53b680924800ad6c67f7e54ca7d5bdc4859d2318 (diff)
parenta7dc19b8652c862d5b7c4d2339bd3c428bd29c4a (diff)
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner: "A single bugfix which prevents that a non functional timer device is selected to provide the fallback device, which is supposed to serve timer interrupts on behalf of non functional devices ..." * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clockevents: Don't allow dummy broadcast timers
Diffstat (limited to 'kernel/trace/trace_nop.c')
0 files changed, 0 insertions, 0 deletions