linux-next: manual merge of the s5p tree with the tree

[Stephen Rothwell]

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s3c2410/include/mach/system-reset.h between commit
281c8724c10c ("ARM: restart: Temporary #error to persuade platform
maintainers to take the restart changes seriously") from the arm tree and
commit 11ca5f97077d ("ARM: restart: S3C24XX: use new restart hook") from
the s5p tree.

The arm tree patch seems to have had the desired affect so I used the s5p
tree version.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature