Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse source

* 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  timers: Fix slack calculation for expired timers
  timekeeping: Fix timezone update

...

This commit is contained in:

Linus Torvalds 2010-05-24 07:59:17 -07:00

parent 0fed2b5cb4 f00e047efd

commit c3ed9ea4ab

2 changed files with 8 additions and 7 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

8

kernel/time.c

View file

7

kernel/timer.c

View file