On Wed, Jul 10, 2013 at 01:02:41AM -0700, Tony Lindgren wrote: > The following changes since commit ddcf6600b133697adbafd96e080818bdc0dfd028: > > Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (2013-07-03 19:56:35 -0700) > > are available in the git repository at: > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/fixes-for-merge-window Thanks, merged. There was a quite verbose merge conflict due to the changes of the Kconfig in our fixes branch, so please double-check my resolution. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
