From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 8 Aug 2008 16:33:47 +0000 (+0100)
Subject: Merge Linus' latest into master
X-Git-Tag: v2.6.27-rc3~67^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=097d9eb537ff4d88b74c3fe67392e27c478ca3c5;p=pandora-kernel.git

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
---

097d9eb537ff4d88b74c3fe67392e27c478ca3c5
Reading git-diff-tree failed