afd2fc02ab
Conflicts: arch/arm/mach-pxa/generic.c arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c arch/arm/mach-pxa/pxa2xx.c arch/arm/mach-pxa/pxa3xx.c arch/arm/mach-pxa/reset.c arch/arm/mach-pxa/spitz.c arch/arm/mach-pxa/tosa.c drivers/watchdog/sa1100_wdt.c |
||
---|---|---|
.. | ||
acquirewdt.c | ||
advantechwdt.c | ||
alim1535_wdt.c | ||
alim7101_wdt.c | ||
ar7_wdt.c | ||
at32ap700x_wdt.c | ||
at91rm9200_wdt.c | ||
bfin_wdt.c | ||
booke_wdt.c | ||
cpu5wdt.c | ||
davinci_wdt.c | ||
ep93xx_wdt.c | ||
eurotechwdt.c | ||
geodewdt.c | ||
hpwdt.c | ||
i6300esb.c | ||
ib700wdt.c | ||
ibmasr.c | ||
indydog.c | ||
iop_wdt.c | ||
it8712f_wdt.c | ||
iTCO_vendor_support.c | ||
iTCO_wdt.c | ||
ixp4xx_wdt.c | ||
ixp2000_wdt.c | ||
Kconfig | ||
ks8695_wdt.c | ||
machzwd.c | ||
Makefile | ||
mixcomwd.c | ||
mpc8xx_wdt.c | ||
mpc83xx_wdt.c | ||
mpc5200_wdt.c | ||
mpcore_wdt.c | ||
mtx-1_wdt.c | ||
mv64x60_wdt.c | ||
omap_wdt.c | ||
omap_wdt.h | ||
pc87413_wdt.c | ||
pcwd_pci.c | ||
pcwd_usb.c | ||
pcwd.c | ||
pnx4008_wdt.c | ||
rm9k_wdt.c | ||
s3c2410_wdt.c | ||
sa1100_wdt.c | ||
sb_wdog.c | ||
sbc60xxwdt.c | ||
sbc7240_wdt.c | ||
sbc8360.c | ||
sbc_epx_c3.c | ||
sc520_wdt.c | ||
sc1200wdt.c | ||
scx200_wdt.c | ||
shwdt.c | ||
smsc37b787_wdt.c | ||
softdog.c | ||
txx9wdt.c | ||
w83627hf_wdt.c | ||
w83697hf_wdt.c | ||
w83877f_wdt.c | ||
w83977f_wdt.c | ||
wafer5823wdt.c | ||
wd501p.h | ||
wdrtas.c | ||
wdt285.c | ||
wdt977.c | ||
wdt_pci.c | ||
wdt.c |