On 04/13/2012 12:04 PM, Jonathan Cameron wrote: > [...] > +<<<<<<< HEAD > * correspond to the first name that the channel is referred > * to by in the datasheet (e.g. IND), or the nearest > * possible compound name (e.g. IND-INC). > * @processed_val: Flag to specify the data access attribute should be > * *_input rather than *_raw. > +======= > + * correspond to the first name that the channel is > + * referred to by in the datasheet (e.g. IND), or the > + * nearest possible compound name (e.g. IND-INC). > +>>>>>>> adbde46... staging:iio: drop procesed_val element of chan_spec. > [...] Looks like something went wrong here. -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
