Merge tag 'v4.13.7' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.13-stable

[email protected] Tue, 24 Oct 2017 15:47:42 +0200

Newsgroups	gmane.linux.ports.mips.cvs
Message-ID	<S23991940AbdJXNro5NX2l/[email protected]>

Author: Ralf Baechle <[email protected]> Tue Oct 24 15:32:07 2017 +0200
Commit: 7e07a52b2a02489400fa152451564482a331a711
Gitweb: https://git.linux-mips.org/g/ralf/linux/7e07a52b2a02
Branch: linux-4.13-stable

---

 Documentation/watchdog/watchdog-parameters.txt |    2 +-
 Makefile                                       |    2 +-
 drivers/watchdog/iTCO_wdt.c                    |   22 ++++++++++++----------
 kernel/exit.c                                  |    6 ++++++
 4 files changed, 20 insertions(+), 12 deletions(-)