| commit | 87aa08b7fee79dac908c80f7593007243448ef89 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 12 15:56:33 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 12 15:56:33 2009 -0800 |
| tree | 0fce69996e4be3cfce35300831584a76a4ff1519 | |
| parent | 3b1b71950b81c4a20ae63c2322383ab4932cdabd [diff] | |
| parent | 618efba999d0e7f4bcde93231dcb9a748223c6e3 [diff] |
Merge git://git.kernel.org/pub/scm/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