diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-07-09 08:35:46 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-09 08:35:46 -0400 |
| commit | c7fe190c0cfa227eb21540e34b796e4b823b9613 (patch) | |
| tree | 290f837f8502526ad90e6c7f36d7c82f8999b7f7 /drivers/watchdog/ath79_wdt.c | |
| parent | fa699c8ff49759b86a408578bd25dadf664e294d (diff) | |
| parent | 5e9a2a3622d30c36814ea4df359c83dde1bf53a5 (diff) | |
Merge tag 'v3.10.46' into v3.10-rt
This is the 3.10.46 stable release
Conflicts:
include/linux/irqdesc.h
Diffstat (limited to 'drivers/watchdog/ath79_wdt.c')
0 files changed, 0 insertions, 0 deletions