Merge branch 'v4.17-rc1'
authorWim Van Sebroeck <wim@linux-watchdog.org>
Sat, 24 Mar 2018 09:20:26 +0000 (10:20 +0100)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Sat, 24 Mar 2018 09:20:26 +0000 (10:20 +0100)
1  2 
drivers/watchdog/aspeed_wdt.c

Simple merge