diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-07 13:00:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-07 13:00:11 -0700 |
| commit | b0fb422281c8c09c8dcf03ca44ec343f0ff9df0b (patch) | |
| tree | 85866700657ec97d8eae343146dd61519771f699 /include/linux/timerqueue.h | |
| parent | Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 and git://git.infradead.org/ubi-2.6 (diff) | |
| parent | x86, perf: Check that current->mm is alive before getting user callchain (diff) | |
Merge branch 'perf-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip
* 'perf-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
x86, perf: Check that current->mm is alive before getting user callchain
perf_event: Fix broken calc_timer_values()
perf events: Fix slow and broken cgroup context switch code
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions