diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-13 01:16:29 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-13 01:16:29 +0100 |
| commit | a0e5056e3b733ecb7d3089f8e1e6529525490ab9 (patch) | |
| tree | badb1c482b291cd942e8c7955246f8b044e900bb /drivers/hwmon/lm75.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ger... (diff) | |
| parent | s390/timer: avoid overflow when programming clock comparator (diff) | |
| download | linux-a0e5056e3b733ecb7d3089f8e1e6529525490ab9.tar.xz linux-a0e5056e3b733ecb7d3089f8e1e6529525490ab9.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux into akpm
Pull s390 regression fix from Martin Schwidefsky:
"The recent fix for the s390 sched_clock() function uncovered yet
another bug in s390_next_ktime which causes an endless loop in KVM.
This regression should be fixed before v3.8.
I keep the fingers crossed that this is the last one for v3.8."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/timer: avoid overflow when programming clock comparator
Diffstat (limited to 'drivers/hwmon/lm75.h')
0 files changed, 0 insertions, 0 deletions