Merge branches 'timers/clocksource', 'timers/hpet', 'timers/hrtimers', 'timers/nohz...
authorIngo Molnar <mingo@elte.hu>
Thu, 25 Dec 2008 17:02:25 +0000 (18:02 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 25 Dec 2008 17:02:25 +0000 (18:02 +0100)
commit32e8d18683adb322c994d1a0fe02d66380991f45
tree1c697f6d1c042dc560b096dca76680f4acf415b3
parent4a6908a3a050aacc9c3a2f36b276b46c0629ad91
parent0a57b783018a77ca16097198844438bdff4d012e
parent39c04b55240342d0742ac48538d3d8c71bfc0a94
parentb2e3c0adec918ea22b6c9d7c76193dd3aaba9bd4
parent001474491fabeca233168a8598f721c808040f90
parentc29541b24fb2c6301021637229ae5347c877330a
parent8187926bdae98648db24db3391c4efd21ec669b1
parenta5a64498c194c82ecad3a2d67cff6231cda8d3dd
Merge branches 'timers/clocksource', 'timers/hpet', 'timers/hrtimers', 'timers/nohz', 'timers/ntp', 'timers/posixtimers' and 'timers/rtc' into timers/core
kernel/posix-timers.c
kernel/sched.c
kernel/time/tick-sched.c