On 23/07/15 21:33, Greg KH wrote: > On Thu, Jul 23, 2015 at 09:17:16PM +0100, Jonathan Cameron wrote: >> The following changes since commit 7eb7ee30559c9c88ca23fa3b95bd06629669d0a8: >> >> staging: vt6656: check ieee80211_bss_conf bssid not NULL (2015-07-19 11:48:19 +0100) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-fixes-for-4.2c > > I hit a merge conflict in drivers/iio/light/stk3310.c, which I think I > fixed up properly, but if you could pull my tree and verify I got it > correct, that would be great. Looks good to me. Sorry about that, I should really have dry run it but didn't think there was anything messy! Jonathan > > thanks, > > 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
