git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c41107c aeee90d)
Merge Linus' latest into master
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 8 Aug 2008 16:33:47 +0000 (17:33 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 8 Aug 2008 18:18:18 +0000 (19:18 +0100)
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


Trivial merge
Pandora Kernel Repository