diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-09 17:07:24 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-09 17:07:24 +0100 |
commit | 975e32c287a9b144cf115d3f42ca18664b3331df (patch) | |
tree | c45cb3cd1bcaf2d09efeeaec192d344c898f2c70 /kernel/up.c | |
parent | sys_getppid: add missing rcu_dereference (diff) | |
parent | Merge branch 'perf/urgent' of git://github.com/acmel/linux into perf/urgent (diff) | |
download | linux-975e32c287a9b144cf115d3f42ca18664b3331df.tar.xz linux-975e32c287a9b144cf115d3f42ca18664b3331df.zip |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Do no try to schedule task events if there are none
lockdep, kmemcheck: Annotate ->lock in lockdep_init_map()
perf header: Use event_name() to get an event name
perf stat: Failure with "Operation not supported"
Diffstat (limited to 'kernel/up.c')
0 files changed, 0 insertions, 0 deletions