linux-next: manual merge of the arm-mpidr tree with the arm tree

[Stephen Rothwell]

Hi Lorenzo,

Today's linux-next merge of the arm-mpidr tree got a conflict in
arch/arm/kernel/suspend.c between commit 7604537bbb57 ("ARM: kernel:
implement stack pointer save array through MPIDR hashing") from the arm
tree and commit 3fed6a1e3bf0 ("ARM: kernel: implement stack pointer save
array through MPIDR hashing") from the arm-mpidr tree.

The former is just a rebase of the latter, so I used it.  It then turns
out that the arm-mpidr contains nothing that is not already included in
the arm tree, so is it needed any more i.e. is there further work coming?

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature