* Russell King - ARM Linux <li...@arm.linux.org.uk> [110305 01:55]:
> 
> So I suspect that a merge conflict hasn't been resolved correctly.  I'm
> not going to worry about that because I have the merge conflict resolution
> here already as part of my tree.

Sounds like that's the case, I'll take a look.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to