On Thu, Mar 19, 2009 at 09:12:47PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got conflicts due to the > removal of the benet driver from staging in Linus' tree. Yes, sorry, Linus took that patch and I didn't have a chance to update my tree yet. Give me an hour or so to get it merged up properly. thanks, greg k-h -- 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
