Merge commit '011f2d3' into cg_merges_20131108a

Conflicts:
	miner.h

miner.h

@@ -1356,6 +1356,9 @@ struct work {
 	// Allow devices to identify work if multiple sub-devices
 	// DEPRECATED: New code should be using multiple processors instead
 	unsigned char	subid;
+	
+	// Allow devices to timestamp work for their own purposes
+	struct timeval	tv_stamp;
 
 	blktemplate_t	*tmpl;
 	int		*tmpl_refcount;