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

diff --cc drivers/pinctrl/sh-pfc/pfc-r8a7740.c
index a189b96,bc5eb45..61e2585
--- 1/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
--- 2/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 bcdd5c3,cc097b6..9f66a50
--- 1/drivers/pinctrl/sh-pfc/pfc-sh7372.c
--- 2/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;