aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/posix-timers.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-15 15:15:16 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-15 15:15:16 -0500
commit5274f8354d6a1ed9d6688e6a89b705b94aa1b6e9 (patch)
treea40ae6f754648311b27811acbbd7af61cc65eab0 /kernel/posix-timers.c
parentad0b0fd554dfc126b5750d14908dccc3bbf602be (diff)
parenta0490fa35dc0022ef95f64802e8edf18c411c790 (diff)
parentd2f8d7ee1a9b4650b4e43325b321801264f7c37a (diff)
Merge branch 'sched/urgent'; commit 'v2.6.29-rc5' into sched/core