linux-next: manual merge of the akpm tree with the arm-current tree

Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in arch/arm/kernel/process.c between commit 19ab428f4b79 ("ARM: 7759/1: decouple CPU offlining from reboot/shutdown") from the tree and commit ("reboot: move arch/x86 reboot= handling to generic kernel") from the akpm tree. I

linux-next: manual merge of the akpm tree with the arm-current tree

Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in arch/arm/kernel/process.c between commit 19ab428f4b79 (ARM: 7759/1: decouple CPU offlining from reboot/shutdown) from the tree and commit (reboot: move arch/x86 reboot= handling to generic kernel) from the akpm tree. I fixed