From: Simon Horman <horms+renesas@verge.net.au>
Date: Thu, 19 Dec 2013 08:14:25 +0000 (+0900)
Subject: Merge tag 'v3.13-rc3' into dt3-base
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=236573d2405d6b9fa5395d14731c2ec2f8cb8f4f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'v3.13-rc3' into dt3-base

Linux 3.13-rc3

Conflicts:
	drivers/pinctrl/sh-pfc/pfc-r8a7740.c
	drivers/pinctrl/sh-pfc/pfc-sh7372.c
---

236573d2405d6b9fa5395d14731c2ec2f8cb8f4f
diff --cc drivers/pinctrl/sh-pfc/pfc-r8a7740.c
index a189b962a1eb,bc5eb453a45c..61e258577881
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
@@@ -3709,8 -3720,8 +3709,8 @@@ static void __iomem *r8a7740_pinmux_por
  		const struct r8a7740_portcr_group *group =
  			&r8a7740_portcr_offsets[i];
  
- 		if (i <= group->end_pin)
+ 		if (pin <= group->end_pin)
 -			return pfc->window->virt + group->offset + pin;
 +			return pfc->windows->virt + group->offset + pin;
  	}
  
  	return NULL;
diff --cc drivers/pinctrl/sh-pfc/pfc-sh7372.c
index bcdd5c3cdcf0,cc097b693820..9f66a5025db0
--- a/drivers/pinctrl/sh-pfc/pfc-sh7372.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7372.c
@@@ -2573,8 -2584,8 +2573,8 @@@ static void __iomem *sh7372_pinmux_port
  		const struct sh7372_portcr_group *group =
  			&sh7372_portcr_offsets[i];
  
- 		if (i <= group->end_pin)
+ 		if (pin <= group->end_pin)
 -			return pfc->window->virt + group->offset + pin;
 +			return pfc->windows->virt + group->offset + pin;
  	}
  
  	return NULL;