diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 10:06:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 10:06:19 -0700 |
| commit | 19035e5b5d1e3127b4925d86f6a77964f91f2c3c (patch) | |
| tree | c9e7e9073970176a5b0970da715cb6430c3c9069 /arch/s390/kernel/ipl.c | |
| parent | f9db6e095115f9411b9647bdb9d81fe11f3d8b54 (diff) | |
| parent | eea08f32adb3f97553d49a4f79a119833036000a (diff) | |
Merge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
timers: Logic to move non pinned timers
timers: /proc/sys sysctl hook to enable timer migration
timers: Identifying the existing pinned timers
timers: Framework for identifying pinned timers
timers: allow deferrable timers for intervals tv2-tv5 to be deferred
Fix up conflicts in kernel/sched.c and kernel/timer.c manually
Diffstat (limited to 'arch/s390/kernel/ipl.c')
0 files changed, 0 insertions, 0 deletions