summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-26 15:45:52 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-26 15:45:52 +0100
commit7c526e1fef8d604a9ec022d9145bba5dbfe40a11 (patch)
tree0234bf6c439cb0b91c69ac0eed28c526d05cbf2f /kernel
parentMerge branch 'timers/hpet' into timers/core (diff)
parenttimers: add mod_timer_pending() (diff)
parenttime: ntp: fix bug in ntp_update_offset() & do_adjtimex(), fix (diff)
parentposix timers: fix RLIMIT_CPU && fork() (diff)
downloadlinux-7c526e1fef8d604a9ec022d9145bba5dbfe40a11.tar.xz
linux-7c526e1fef8d604a9ec022d9145bba5dbfe40a11.zip
Merge branches 'timers/new-apis', 'timers/ntp' and 'timers/urgent' into timers/core