summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-06 09:33:57 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-06 09:33:57 +0100
commitd9be28ea9110c596a05bd2d56afa94251bd19818 (patch)
treec23a960b9087694a880011a4a956cbcf8c3c5b72 /kernel/time
parentc70f22d203fc02c805b6ed4a3483b740dc36786b (diff)
parent1c5745aa380efb6417b5681104b007c8612fb496 (diff)
parent47fea2adfc9e16846bc57c2f64ff233b354fef39 (diff)
parent238c6d54830c624f34ac9cf123ac04aebfca5013 (diff)
Merge branches 'sched/clock', 'sched/cleanups' and 'linus' into sched/urgent