2013-04-17 06:03:11

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: manual merge of the renesas tree with the gen-gpio tree

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
drivers/pinctrl/sh-pfc/Kconfig between commit 76ec9d18b897 ("Convert
selectors of GENERIC_GPIO to GPIOLIB") from the gen-gpio tree and commit
809e5fce84f4 ("sh-pfc: Remove dependency on GPIOLIB") from the renesas

I fixed it up (using the latter) and can carry the fix as necessary (no
action is required).

Stephen Rothwell [email protected]

(No filename) (457.00 B)
(No filename) (836.00 B)
Download all attachments