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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
include/linux/percpu-defs.h between commit
b01e8dc34379f4ba2f454390e340a025edbaaa7e ("alpha: fix percpu build
breakage") from Linus' tree and commit
7c756e6e19e71f0327760d8955f7077118ebb2b1 ("percpu: implement optional
weak percpu definitions") from the percpu tree.

The latter seems to subsume the former changes, so I just used the percpu
tree version of this file.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature