097d9eb537
Conflicts: drivers/watchdog/at91rm9200_wdt.c drivers/watchdog/davinci_wdt.c drivers/watchdog/ep93xx_wdt.c drivers/watchdog/ixp2000_wdt.c drivers/watchdog/ixp4xx_wdt.c drivers/watchdog/ks8695_wdt.c drivers/watchdog/omap_wdt.c drivers/watchdog/pnx4008_wdt.c drivers/watchdog/sa1100_wdt.c drivers/watchdog/wdt285.c |
||
|---|---|---|
| .. | ||
| at32 | ||
| at91 | ||
| au1x | ||
| codecs | ||
| davinci | ||
| fsl | ||
| omap | ||
| pxa | ||
| s3c24xx | ||
| sh | ||
| Kconfig | ||
| Makefile | ||
| soc-core.c | ||
| soc-dapm.c | ||