Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Jan 2009 23:56:33 +0000 (15:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Jan 2009 23:56:33 +0000 (15:56 -0800)
commit87aa08b7fee79dac908c80f7593007243448ef89
tree0fce69996e4be3cfce35300831584a76a4ff1519
parent3b1b71950b81c4a20ae63c2322383ab4932cdabd
parent618efba999d0e7f4bcde93231dcb9a748223c6e3
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