Subject: linux-next: manual merge of the cpu_alloc tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 28 Oct 2008 17:05:44 +1100

Hi Christoph,

Today's linux-next merge of the cpu_alloc tree got a conflict in
kernel/module.c between commit d3794979a8a80c222ce9d016a6dfc4bed36965d0
("Zero based percpu: infrastructure to rebase the per cpu area to zero")
from the tip-core tree and commit
3ba98730fe1feb5b3fd9747fa1d3d629cd7ec0f7 ("cpualloc: use cpu allocator
instead of the builtin modules per cpu allocator") from the cpu_alloc
tree.

The latter removed code that the former modified.  I removed the code and
can carry this fix.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/