commit | 1b464d8429983ed56ae070f038841abfcc60b85f | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 22 09:17:30 2011 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 22 09:17:30 2011 -0800 |
tree | 9f78ef145e269268132f1e6b1fbd43c15f2a9a12 | |
parent | e25ba0ce039d1c5cae0b0057e4b9e228dc6744bd [diff] | |
parent | 20403e845f9988446c5b48024ff4d0c3a5929f7d [diff] |
Merge git://www.linux-watchdog.org/linux-watchdog * git://www.linux-watchdog.org/linux-watchdog: watchdog: fix initialisation printout in s3c2410_wdt watchdog: Don't overwrite error value in wm831x_wdt_set_timeout() watchdog: adx_wdt.c: remove driver