Merge tag 'v3.13-rc3' into dt3-base
authorSimon Horman <horms+renesas@verge.net.au>
Thu, 19 Dec 2013 08:14:25 +0000 (17:14 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Thu, 19 Dec 2013 08:14:25 +0000 (17:14 +0900)
Linux 3.13-rc3

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


Trivial merge