summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-08 20:14:11 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-08 20:14:11 +0100
commit5ba1ae92b6796b3367152ccd9baa022dde7eed4c (patch)
tree3283a40603c06342d4197d838f6f1dec247a1474 /kernel
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff)
parentclockevents: let set_mode() setup delta information (diff)
parentx86: hpet: allow force enable on ICH10 HPET (diff)
parenthrtimer: prevent negative expiry value after clock_was_set() (diff)
parentx86: clean up hpet timer reinit (diff)
downloadlinux-5ba1ae92b6796b3367152ccd9baa022dde7eed4c.tar.xz
linux-5ba1ae92b6796b3367152ccd9baa022dde7eed4c.zip
Merge branches 'timers/clockevents', 'timers/hpet', 'timers/hrtimers' and 'timers/urgent' into timers/core