commit | 335bc70b6b5fdc9b4e28cb56c27f10124064f9da | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 18 14:29:37 2011 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 18 14:29:37 2011 -0800 |
tree | 7f5a1594a09cdcb2ea9a5d768ea72c0256f6aa3c | |
parent | 404cbbd52f10d1d5719ad82ce8ba903890779255 [diff] | |
parent | 66832eb4baaaa9abe4c993ddf9113a79e39b9915 [diff] |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Validate cpu early in perf_event_alloc() perf: Find_get_context: fix the per-cpu-counter check perf: Fix contexted inheritance