linux-next: manual merge of the gpio tree with the trivial tree

[Stephen Rothwell]

Hi Grant,

Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpio-ep93xx.c between commit 1c5454eed85a ("Change Ryan
Mallon's email address across the kernel") from the trivial tree and
commit 1e4c88420e0d ("gpio/ep93xx: convert to platform_driver and use
basic_mmio_gpio library") from the gpio tree.

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

diff --cc drivers/gpio/gpio-ep93xx.c
index 1a0f852,3bfd341..0000000
--- a/drivers/gpio/gpio-ep93xx.c
+++ b/drivers/gpio/gpio-ep93xx.c
@@@ -1,9 -1,8 +1,8 @@@
  /*
-  * linux/arch/arm/mach-ep93xx/gpio.c
-  *
   * Generic EP93xx GPIO handling
   *
 - * Copyright (c) 2008 Ryan Mallon <ryan@xxxxxxxxxxxxxxxx>
 + * Copyright (c) 2008 Ryan Mallon
+  * Copyright (c) 2011 H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
   *
   * Based on code originally from:
   *  linux/arch/arm/mach-ep93xx/core.c
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/