67d2c36e90
Automated merge from master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog failed due to duplicate different changes to Kconfig file. Manually fixed up. Hopefully. |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
acquirewdt.c | ||
advantechwdt.c | ||
alim1535_wdt.c | ||
alim7101_wdt.c | ||
booke_wdt.c | ||
cpu5wdt.c | ||
eurotechwdt.c | ||
i8xx_tco.c | ||
i8xx_tco.h | ||
ib700wdt.c | ||
indydog.c | ||
ixp4xx_wdt.c | ||
ixp2000_wdt.c | ||
machzwd.c | ||
mixcomwd.c | ||
mpc8xx_wdt.c | ||
pcwd.c | ||
pcwd_pci.c | ||
pcwd_usb.c | ||
s3c2410_wdt.c | ||
sa1100_wdt.c | ||
sbc60xxwdt.c | ||
sc520_wdt.c | ||
sc1200wdt.c | ||
scx200_wdt.c | ||
shwdt.c | ||
softdog.c | ||
w83627hf_wdt.c | ||
w83877f_wdt.c | ||
wafer5823wdt.c | ||
wd501p.h | ||
wdrtas.c | ||
wdt.c | ||
wdt285.c | ||
wdt977.c | ||
wdt_pci.c |