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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 1 Jul 2009 17:19:25 +1000

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/alpha/include/asm/percpu.h between commit
b01e8dc34379f4ba2f454390e340a025edbaaa7e ("alpha: fix percpu build
breakage") from Linus' tree and commit
6088464cf1ae9fb3d2ccc0ec5feb3f5b971098d8 ("alpha: kill unnecessary __used
attribute in PER_CPU_ATTRIBUTES") from the percpu tree.

The latter just removes what the former changed, so I used the percpu
tree version of this file.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/