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

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-nuc93x/time.c between commit 6adc1e7ff19d ("ARM:
mach-nuc93x: delete") from the arm-soc tree and commit 699324871fcc
("treewide: remove extra semicolons from various parts of the kernel")
from the trivial tree.

The former removed the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature