Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

Browse source

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
  NOHZ: reevaluate idle sleep length after add_timer_on()
  clocksource: revert: use init_timer_deferrable for clocksource_watchdog

...

This commit is contained in:

Linus Torvalds 2008-03-26 11:29:35 -07:00

parent 729eb528c7 06d8308c61

commit 8f404faa72

4 changed files with 59 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

43

kernel/sched.c

View file

2

kernel/time/clocksource.c

View file

10

kernel/timer.c

View file