linux-next: manual merge of the arm-soc tree with the modules tree

Hi all, Today's linux-next merge of the arm-soc tree got conflicts in arch/cris/include/asm/Kbuild, arch/h8300/include/asm/Kbuild and arch/m32r/include/asm/Kbuild between commit 786d35d45cc4 ("Make most arch asm/module.h files use asm-generic/module.h") from the modules tree and commit

linux-next: manual merge of the arm-soc tree with the modules tree

Hi all, Today's linux-next merge of the arm-soc tree got conflicts in arch/cris/include/asm/Kbuild, arch/h8300/include/asm/Kbuild and arch/m32r/include/asm/Kbuild between commit 786d35d45cc4 (Make most arch asm/module.h files use asm-generic/module.h) from the modules tree and commit e7a570ff7dff