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

[Linus Torvalds]

On Mon, Aug 1, 2016 at 7:24 PM, Stephen Rothwell <sfr at canb.auug.org.au> wrote:
>
> This merge fix patch was missed when Linus merged the various bits of
> the arm-soc tree overnight. :-(
>
> Here is the merge fix patch again:

Thanks, applied.

          Linus