]> err.no Git - linux-2.6/commit
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)
commit097d9eb537ff4d88b74c3fe67392e27c478ca3c5
tree9034d676d9096857a380aab9d99e3e88fccb6bfe
parentc41107c2d4fd31924533f4dbc4c3428acc2b5894
parentaeee90dfa01844168cd7f8051d0a0f969c573067
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
13 files changed:
drivers/media/video/pxa_camera.c
drivers/watchdog/at91rm9200_wdt.c
drivers/watchdog/davinci_wdt.c
drivers/watchdog/ep93xx_wdt.c
drivers/watchdog/iop_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/s3c2410_wdt.c
drivers/watchdog/sa1100_wdt.c
drivers/watchdog/wdt285.c