linux-next: manual merge of the rr tree with Linus' tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in kernel/cpu.c
between commit 31950eb66ff47c946fd9c65c2f8c94b6b7ba13fc ("mm/init:
cpu_hotplug_init() must be initialized before SLAB") from Linus' tree and
commit 7ad613eb4d867245f0964e395e6087ae7f126b95 ("cpuhotplug: remove
cpu_hotplug_init()") from the rr tree.

It looks like they are trying to do the same thing ... I used the version
from Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature