]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 05:21:43 +0000 (16:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 05:21:43 +0000 (16:21 +1100)
commit5afc746828311f7fe2046351564a3d474a4eb118
treea616ad5da14de681bbd1f87e616094e769bbb878
parent6471915fe8cb4cb10cfdcaee821a0d4a931b00f1
parent37ef1d9243759ca69032be2a68d5d1a87a295fd4
Merge remote-tracking branch 'pinctrl/for-next'

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