| commit | 696e65c3606aa3f587eeb181766baf49ea750cfc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 28 07:55:35 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 28 07:55:35 2010 -0700 |
| tree | 1975089f9faa51eb40f6680b3dd7394cd57b8eed | |
| parent | 1600f9def09de07c5dbeb539e978fa73880690dd [diff] | |
| parent | d8d8b63b6dc413696ade040e52173c068df11702 [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: booke_wdt: fix build - unconstify watchdog_info watchdog: sbc_fitpc2_wdt: fixed "scheduling while atomic" bug. watchdog: sbc_fitpc2_wdt: fixed I/O operations order Watchdog: sb_wdog.c: Fix sibyte watchdog initialization