On Tue, Oct 28, 2014 at 02:40:21PM +0200, Daniel Baluta wrote: > On Sat, Oct 25, 2014 at 12:56 PM, Jonathan Cameron <jic23@xxxxxxxxxx> wrote: > > On 22/10/14 15:12, Daniel Baluta wrote: > >> On Wed, Oct 22, 2014 at 4:50 PM, Roberta Dobrescu > >> <roberta.dobrescu@xxxxxxxxx> wrote: > >>> This patch adds the missing IIO modifiers in event_is_known function > >>> and iio_modifier_names vector. > >>> > >>> Additionally, it removes duplicate name entries of IIO_MOD_LIGHT_BOTH > >>> and IIO_MOD_LIGHT_IR in iio_modifier_names. > >>> > >>> Signed-off-by: Roberta Dobrescu <roberta.dobrescu@xxxxxxxxx> > >> > >> Reviewed-by: Daniel Baluta <daniel.baluta@xxxxxxxxx> > >> > > Applied to the togreg branch of iio.git - initially pushed out as > > testing for the autobuilders to play. > > Hi, > > FYI: > > Please note that this patch is both in Greg's staging-testing [1] > and Jonathan's testing [2] tree. > > thanks, > Daniel. > > [1] https://git.kernel.org/cgit/linux/kernel/git/gregkh/staging.git/commit/?h=staging-testing&id=0a6e2170dfcd2b17ae32ad91993edf2b77014137 > [2] https://git.kernel.org/cgit/linux/kernel/git/jic23/iio.git/commit/?h=testing&id=a9bef750135cc261bfceff6840a30a3f357df8da That's ok, git handles that just fine when we merge together. greg k-h -- 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
