git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0967d61 7c4be5a)
[WATCHDOG] Merge code clean-up's from Alan Cox.
authorWim Van Sebroeck <wim@iguana.be>
Wed, 6 Aug 2008 11:58:26 +0000 (11:58 +0000)
committerWim Van Sebroeck <wim@iguana.be>
Wed, 6 Aug 2008 11:58:26 +0000 (11:58 +0000)
commit96e2e6fafaedd83bd899f682907e14d1eec17390
tree62371e739210426c1a6341b0afc5b2d933ef23cetree
parent0967d61ea0d8e8a7826bd8949cd93dd1e829ac55commit | diff
parent7c4be5aa8dce9ba37fdd971d5560490d9e30c270commit | 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>
drivers/watchdog/booke_wdt.c diff1 | diff2 | blob | history
drivers/watchdog/hpwdt.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.