]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
watchdog: sync mainline changes
authorFelipe Balbi <felipe.balbi@nokia.com>
Tue, 23 Sep 2008 11:33:49 +0000 (14:33 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 23 Sep 2008 12:55:53 +0000 (15:55 +0300)
commit572d9fbd5940e864c076c7b879dde695693edb8b
tree8b2f311de652016c9f7253abcfd5bb2ed11b18b4
parent422d19a5456fe0c51f33d99508e417d86eef7fcf
watchdog: sync mainline changes

Some changes to omap_wdt.c were lost due to, probably,
mis-merges and developers working separately on
linux-omap and mainline.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/watchdog/omap_wdt.c