Re: linux-next: Tree for March 10

[Wim Van Sebroeck]

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.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/