diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-25 11:24:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-25 11:24:04 -0700 |
| commit | 44afa9a4b8c5773f47e6494da12ca086c9ffea34 (patch) | |
| tree | 0945f4dbbc785382e0d7e8607897fb360f550c52 /kernel/trace/kmemtrace.c | |
| parent | 7d63e6359a2e86cd6335337de99354ab07680c55 (diff) | |
| parent | f833bab87fca5c3ce13778421b1365845843b976 (diff) | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
clockevent: Prevent dead lock on clockevents_lock
timers: Drop write permission on /proc/timer_list
Diffstat (limited to 'kernel/trace/kmemtrace.c')
0 files changed, 0 insertions, 0 deletions