On Thu, 07 Feb 2013, Mark Brown wrote: > On Wed, Feb 06, 2013 at 10:53:23AM +0000, Lee Jones wrote: > > This patch supplies access to some extra settings provided by the > > AB8500 regulator device. We also update some of the existing > > initialisation values in accordance with internal ST-Ericsson code > > submissions. This single patch was originally a collection of updates > > which have been squashed together to aid with clarity. > > I tried to apply this but got conflicts - can you please check what's > going on with this vs my topic/ab8500 branch?
It's almost certainly because you're trying to pull the patches in out of order. This _will_ end in conflicts. Any chance you can start from 01 and work your way though them. I will fixup any that you don't like on the fly. -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
