From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Mon, 1 Sep 2008 19:10:19 +1000 > I have applied the following patch. I will carry this patch unless a > better solution comes along. That patch is the proper way to resolve this merge conflict, please carry it :-) -- 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
