From: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx> Date: Tue, 17 Nov 2009 13:32:54 +0000 > You will need to merge Linus's tree into net-next-2.6 and resolve the > conflict by applying Jean's changes to drivers/net/sfc/falcon_boards.c. Ok, I'll sort this out after I next push to Linus, thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
