]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1a0d26b 41e3a64)
[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)
commit4ed29d7cd36c9ee553a2fa9a9f4eaf0af88e05a9
tree62371e739210426c1a6341b0afc5b2d933ef23cetree | snapshot
parent1a0d26bee435eefdb50d46027618dadfbc1e0041commit | diff
parent41e3a640fc948684698ca44c06ef74ad53a5c929commit | 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
Linux Kernel Source Tree.