Re: [GIT PULL] trivial for 3.17

[Linus Torvalds]

On Wed, Aug 6, 2014 at 2:37 AM, Jiri Kosina <jkosina@xxxxxxx> wrote:
>
> You are going to get two conflicts super-easy to resolve:
>
> - arch/arm/mach-msm/Kconfig removal of unused MSM_SCM config value
>   conflicts with addition of MSM_TIMER to the same spot; resolution is to
>   keep MSM_TIMER and remove MSM_SCM

That's not right. Both MSM_TIMER and MSM_SCM went away.

> - Documentation/laptops/hpfall.c conflict easy to resolve by

Looks correct.

         Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/