| commit | a4e71e7937461730998cef56cc924fe731b4d345 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 23 Mar 2013 19:30:39 +0000 (23 12:30 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 23 Mar 2013 19:30:39 +0000 (23 12:30 -0700) | ||
| tree | 0f572150495eddce59a83035cf6f73448a0302be | treesnapshot (tar.gz zip) |
| parent | c19b3b0f6eed552952845e4ad908dba2113d67b4 | commitdiff |
| parent | 81fc933f176cd95f757bfc8a98109ef422598b79 | commitdiff |
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
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