On Tue, Oct 01, 2013 at 01:07:20PM +0200, Thierry Reding wrote: > Today's linux-next merge of the driver-core tree got conflicts in > > include/linux/netdevice.h > > I fixed it up (see below). Please check if the resolution looks correct. Looks correct to me, 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
