diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-08 20:14:11 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-08 20:14:11 +0100 |
commit | 5ba1ae92b6796b3367152ccd9baa022dde7eed4c (patch) | |
tree | 3283a40603c06342d4197d838f6f1dec247a1474 /kernel | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff) | |
parent | clockevents: let set_mode() setup delta information (diff) | |
parent | x86: hpet: allow force enable on ICH10 HPET (diff) | |
parent | hrtimer: prevent negative expiry value after clock_was_set() (diff) | |
parent | x86: clean up hpet timer reinit (diff) | |
download | linux-5ba1ae92b6796b3367152ccd9baa022dde7eed4c.tar.xz linux-5ba1ae92b6796b3367152ccd9baa022dde7eed4c.zip |
Merge branches 'timers/clockevents', 'timers/hpet', 'timers/hrtimers' and 'timers/urgent' into timers/core