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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/plat-orion/Makefile between commit 43b426d6fae8 ("arm: plat-orion: use GPIO driver on CONFIG_GPIOLIB") from the gen-gpio tree and various commits from the arm-soc tree. I fixed it up (see below) and can carry the fix

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/plat-orion/Makefile between commit 43b426d6fae8 (arm: plat-orion: use GPIO driver on CONFIG_GPIOLIB) from the gen-gpio tree and various commits from the arm-soc tree. I fixed it up (see below) and can carry the fix