diff options
author | Linus Torvalds | 2011-06-08 08:36:15 -0700 |
---|---|---|
committer | Linus Torvalds | 2011-06-08 08:36:15 -0700 |
commit | 33726bf2140a0e7c9de3ccd7cba6d69962f0b773 (patch) | |
tree | a4f5bca74d61072533806a2fe7f257357cae1ce2 /arch | |
parent | 5b28f6a25ee202046e2d57bd431671bc23cf3dd1 (diff) | |
parent | d7ebe75b065a7c2d58ffc12f9d2e00d5ea4e71eb (diff) |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf: Fix comments in include/linux/perf_event.h
perf: Comment /proc/sys/kernel/perf_event_paranoid to be part of user ABI
perf python: Fix argument name list of read_on_cpu()
perf evlist: Don't die if sample_{id_all|type} is invalid
perf python: Use exception to propagate errors
perf evlist: Remove dependency on debug routines
perf, cgroups: Fix up for new API
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions