On Thu, 16 Oct 2008, Stephen Rothwell wrote: > Today's linux-next merge of the hid tree got several conflicts against > the usb tree and Linus' tree. > I have dropped it for today, please do a resync with Linus' tree for > tomorrow. Hi Stephen, yes, I have been handling the merge with Linus past two days, fixing some issues, and rebasing several times, etc. so the branch you pull has been rotting a little bit, sorry for that. I have just pushed version that should apply cleanly again. Thanks, -- Jiri Kosina SUSE Labs -- 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
