diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-27 15:53:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-27 15:53:23 -0800 |
| commit | d0bc387dbe7f93b5608e1d305a18f50060de69cb (patch) | |
| tree | f60912cf4348cdbdef409bbe1804cbfcdf473de2 /fs/gfs2/Makefile | |
| parent | 80e0c505b22e64ab1787285b182a1e8395e53991 (diff) | |
| parent | 5da2bf1ac8fbe701a138efb340b9f2ef26c10ed7 (diff) | |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
- a null pointer dereference fix for omap_wdt
- some clock related fixes for pnx4008
- an underflow fix in wdt_set_timeout() for w83977f_wdt
- restart fix for tegra wdt
- Kconfig change to support Freescale Layerscape platforms
- fix for stopping the mtk_wdt watchdog
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: mtk_wdt: Use MODE_KEY when stopping the watchdog
watchdog: Add support for Freescale Layerscape platforms
watchdog: tegra: Stop watchdog first if restarting
watchdog: w83977f_wdt: underflow in wdt_set_timeout()
watchdog: pnx4008: make global wdt_clk static
watchdog: pnx4008: fix warnings caused by enabling unprepared clock
watchdog: omap_wdt: fix null pointer dereference
Diffstat (limited to 'fs/gfs2/Makefile')
0 files changed, 0 insertions, 0 deletions