Hi Wim, On Tue, 10 Mar 2009 10:33:24 +0100 Wim Van Sebroeck <wim@xxxxxxxxx> wrote: > > > 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. Thanks. I could see that they were just continuations of patches that went into Linus' tree, so was not worried about them. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpa0NoPNQpya.pgp
Description: PGP signature
