diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-23 12:30:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-23 12:30:39 -0700 |
commit | a4e71e7937461730998cef56cc924fe731b4d345 (patch) | |
tree | 0f572150495eddce59a83035cf6f73448a0302be /drivers/i2c | |
parent | KMS: fix EDID detailed timing frame rate (diff) | |
parent | watchdog: sp5100_tco: Set the AcpiMmioSel bitmask value to 1 instead of 2 (diff) | |
download | linux-dev-a4e71e7937461730998cef56cc924fe731b4d345.tar.xz linux-dev-a4e71e7937461730998cef56cc924fe731b4d345.zip |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
"Fix a boot issues and correct the AcpiMmioSel bitmask in the
sp5100_tco watchdog device driver"
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: sp5100_tco: Set the AcpiMmioSel bitmask value to 1 instead of 2
watchdog: sp5100_tco: Remove code that may cause a boot failure
Diffstat (limited to 'drivers/i2c')
0 files changed, 0 insertions, 0 deletions