linux-next: manual merge of the clockevents tree with the arm-soc tree

[Linus Torvalds]

On Mon, Aug 1, 2016 at 9:26 PM, Linus Torvalds
<torvalds at linux-foundation.org> wrote:
>
> Thanks, applied.

Gah, and I messed up the whitespace while doing so, so it looks a bit
odd. Sadly, I only noticed after having already pushed out (since I
had decided to just push out immediately as I don't build-test ARM
anyway).

Oh well,

              Linus