diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-05 13:03:28 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 13:03:35 +0100 |
commit | 83895147b702434e6f236deeca75211fd0e3da3a (patch) | |
tree | 550a8a8828592d9aa110d1851cc52e0f2c95bac7 /kernel/posix-cpu-timers.c | |
parent | a6a95406c676ffe4f9dee708eb404a17c69f7fdd (diff) | |
parent | 483b4ee60edbefdfbff0dd538fb81f368d9e7c0d (diff) | |
download | kernel_samsung_smdk4412-83895147b702434e6f236deeca75211fd0e3da3a.zip kernel_samsung_smdk4412-83895147b702434e6f236deeca75211fd0e3da3a.tar.gz kernel_samsung_smdk4412-83895147b702434e6f236deeca75211fd0e3da3a.tar.bz2 |
Merge branch 'sched/urgent' into timers/urgent
Merging it here because an upcoming timers/urgent fix relies on
a change already in sched/urgent and not yet upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/posix-cpu-timers.c')
0 files changed, 0 insertions, 0 deletions