linux-next: manual merge of the samsung tree with the tip tree

[Stephen Rothwell]

Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/plat-samsung/samsung-time.c between commit 38ff87f77af0
("sched_clock: Make ARM's sched_clock generic for all architectures")
from the tip tree and commit 5b8eaaab1668 ("ARM: SAMSUNG: Remove old
samsung-time driver") from the samsung tree.

The latter removed the file, so I did that, and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature