| Conflicts: drivers/serial/Makefile | ||
|---|---|---|
| .. | ||
| Makefile | ||
| at91sam9_wdt.c | ||
| bfin_wdt.c | ||
| ftwdt010_wdt.c | ||
| imx_watchdog.c | ||
| s5p_wdt.c | ||
| tnetv107x_wdt.c | ||
| xilinx_tb_wdt.c | ||
| Conflicts: drivers/serial/Makefile | ||
|---|---|---|
| .. | ||
| Makefile | ||
| at91sam9_wdt.c | ||
| bfin_wdt.c | ||
| ftwdt010_wdt.c | ||
| imx_watchdog.c | ||
| s5p_wdt.c | ||
| tnetv107x_wdt.c | ||
| xilinx_tb_wdt.c | ||