Subject: Re: linux-next: Tree for March 10

From: Wim Van Sebroeck <[email-masked]>
Date: Tue, 10 Mar 2009 10:33:24 +0100

Hi Stephen,

> Merging watchdog/master
> CONFLICT (content): Merge conflict in drivers/watchdog/orion5x_wdt.c
> CONFLICT (content): Merge conflict in drivers/watchdog/rc32434_wdt.c

I redid the linux-2.6-watchdog-next tree. Should be fixed next time.

Kind regards,
Wim.