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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 7 Sep 2009 18:22:29 +1000

Hi all,

Today's linux-next merge of the percpu tree got a conflict in mm/percpu.c
between commit 04a13c7c632e1fe04a5f6e6c83565d2559e37598 ("percpu: don't
assume existence of cpu0") from Linus' tree and commit pcpu_chunk_page_occupied ("percpu: drop pcpu_chunk->page[]") from the percpu tree.

I *think* the changes in the percpu tree supercede those in Linus' tree,
so I have used those.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/