On Wed, Dec 31, 2008 at 11:22:49AM +1100, Stephen Rothwell wrote: > This conflict is now between the device-mapper tree and Linus' tree. Ta - I'll sort it when I rebase after the Xmas/New Year break. Alasdair -- agk@xxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html