On 12/08/15 20:45, Greg KH wrote: > On Wed, Aug 12, 2015 at 08:28:02PM +0100, Jonathan Cameron wrote: >> The following changes since commit b8d1f261fe7e4967593a5637d62991b6197a03f8: >> >> staging: dgap: remove duplicate code (2015-07-16 10:19:55 -0700) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-for-4.3b-2 > > I had to do a merge conflict resolution in one driver, it was pretty > trivial, but if you could check I got it right, that would be great. > > thanks, > > greg k-h I guess that would be the mlx90614.c (mentioned in the reply to the previous pull request so knew that one was coming!) Looks fine to me. Thanks Jonathan -- 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
