• Russell King's avatar
    Merge Linus' latest into master · 097d9eb5
    Russell King authored
    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
    097d9eb5
ixp2000_wdt.c 4.75 KB