| commit | 96e2e6fafaedd83bd899f682907e14d1eec17390 | [log] [tgz] |
|---|---|---|
| author | Wim Van Sebroeck <wim@iguana.be> | Wed Aug 06 11:58:26 2008 +0000 |
| committer | Wim Van Sebroeck <wim@iguana.be> | Wed Aug 06 11:58:26 2008 +0000 |
| tree | 62371e739210426c1a6341b0afc5b2d933ef23ce | |
| parent | 0967d61ea0d8e8a7826bd8949cd93dd1e829ac55 [diff] | |
| parent | 7c4be5aa8dce9ba37fdd971d5560490d9e30c270 [diff] |
[WATCHDOG] Merge code clean-up's from Alan Cox. Merge branch 'alan' of ../linux-2.6-watchdog-mm Fixed Conflicts in the following files: drivers/watchdog/booke_wdt.c drivers/watchdog/mpc5200_wdt.c drivers/watchdog/sc1200wdt.c Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>