diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-02 17:46:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-02 17:46:14 -0800 |
| commit | ef05e9b9602660fd468e05f5fbe8f08ad7418b73 (patch) | |
| tree | 7de3ceb677e7bccb997e3ad80be09b99f528aa42 /kernel/sysctl.c | |
| parent | 080a62e2ceec28163194facb837d6388983aae5d (diff) | |
| parent | 8899b8d93ec64b7a8e54807a68a958e1206535e2 (diff) | |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
"This fixes some small errors in the new da9055 driver, eliminates a
compiler warning and adds DT support for the twl4030_wdt driver (so
that we can have multiple watchdogs with DT on the omap platforms)."
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: twl4030_wdt: add DT support
watchdog: omap_wdt: eliminate unused variable and a compiler warning
watchdog: da9055: Don't update wdt_dev->timeout in da9055_wdt_set_timeout error path
watchdog: da9055: Fix invalid free of devm_ allocated data
Diffstat (limited to 'kernel/sysctl.c')
0 files changed, 0 insertions, 0 deletions