From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Jan 2009 23:56:33 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: firefly_0821_release~15894
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=87aa08b7fee79dac908c80f7593007243448ef89;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] Pika Warp appliance watchdog timer
  [WATCHDOG] Enable watchdog timer on GE Fanuc's SBC610
  [WATCHDOG] Basic support for GE Fanuc's FPGA based watchdog timer
  [WATCHDOG] wm8350: Fix section annotations
---

87aa08b7fee79dac908c80f7593007243448ef89