linux-next: manual merge of the rr tree with Linus' tree
From: Stephen Rothwell
Date: Tue Jun 23 2009 - 23:09:22 EST
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.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature