| commit | 1c1ec9c03efce5853f75e244ff368339767f7b9e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 16 07:26:31 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 16 07:26:31 2010 -0700 |
| tree | b33168aa05d4376052a9652ce5044be00492d14b | |
| parent | 1f829825f21755c48de075cd7722fcd19438f587 [diff] | |
| parent | aebaec975f30c4db40bb418fe9117bb6b4655b1b [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] max63xx driver depends on ioremap() [WATCHDOG] max63xx: be careful when disabling the watchdog [WATCHDOG] fixed book E watchdog period register mask. [WATCHDOG] omap4: Fix WDT Kconfig