tree 9034d676d9096857a380aab9d99e3e88fccb6bfe
parent c41107c2d4fd31924533f4dbc4c3428acc2b5894
parent aeee90dfa01844168cd7f8051d0a0f969c573067
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1218213227 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1218219498 +0100

Merge Linus' latest into master

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