[GIT PULL 2/6] ARM: SoC cleanups for v4.4

[Linus Torvalds]

On Mon, Nov 9, 2015 at 7:33 PM, Olof Johansson <olof at lixom.net> wrote:
>
> Conflicts:
>
> OMAP timer code has a treewide fix vs code deletion conflict. Delete
> the code in HEAD, go with contents from branch.

That doesn't look right. It also needs the clocksource_of_init ->
clocksource_probe changes. The code was moved around rather than
deleted.

               Linus