linux-next: manual merge of the akpm tree with the rr tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/s390/Kconfig arch/x86/Kconfig between commit 380470027b5c ("Make
most arch asm/module.h files use asm-generic/module.h") from the rr tree
and commit 3fcc9766e733 ("atomic64_test: simplify the #ifdef for
atomic64_dec_if_positive() test") from the akpm tree.

Just context changes.  I fixed it up and can carry it as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature