Merge branch 'v4.17-rc1'
authorWim Van Sebroeck <wim@linux-watchdog.org>
Mon, 26 Mar 2018 18:48:27 +0000 (20:48 +0200)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Mon, 26 Mar 2018 18:48:27 +0000 (20:48 +0200)

Trivial merge