Hi Nicholas, Today's linux-next merge of the target-merge tree got conflicts in several files. It looks like a newer version of all the commits in the target-merge tree has been applied to the scsi tree, so I just dropped the target-merge tree for today. You might like to tidy it up with respect to the current scsi tree.
-- Cheers, Stephen Rothwell [email protected] -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
