diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 18:16:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 18:16:29 -0700 |
| commit | d06be221504189f38950111c214802ada0eb1b71 (patch) | |
| tree | bee2ed72066d8f517d86c2280cb450f249e0f12d /kernel/posix-timers.c | |
| parent | 4d831f53ddd5c0117ff40f841cf330c78d242e82 (diff) | |
| parent | 381512cf3d27f63f7a45b1bbe7d2d609c2ea3b74 (diff) | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Avoid printing sched_group::__cpu_power for default case
tracing, sched: mark get_parent_ip() notrace
Diffstat (limited to 'kernel/posix-timers.c')
0 files changed, 0 insertions, 0 deletions