linux-next: manual merge of the moduleh tree with the arm tree

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
arch/arm/common/scoop.c between commit 2f8163baada3 ("ARM: gpio: convert
includes of mach/gpio.h and asm/gpio.h to linux/gpio.h") from the arm
tree and commit d8e58c821f3e ("arm: Add export.h to ARM specific files as
required") from the moduleh tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/common/scoop.c
index 1cde34a,98288e4..0000000

--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c

@@@ -17,6 -16,8 +17,7 @@@
  #include <linux/slab.h>
  #include <linux/platform_device.h>
  #include <linux/io.h>
+ #include <linux/export.h>
 -#include <asm/gpio.h>
  #include <asm/hardware/scoop.h>
  
  /* PCMCIA to Scoop linkage