linux-next: manual merge of the pinctrl tree with the watchdog tree

[Stephen Rothwell]

Hi Linus,

Today's linux-next merge of the pinctrl tree got a conflict in
arch/arm/configs/bcm_defconfig between commit bd90ccd42c5d ("watchdog:
bcm281xx: Watchdog Driver") from the watchdog tree and commit
54b1aa5a5b16 ("ARM: pinctrl: Add Broadcom Capri pinctrl driver") from the
pinctrl tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/configs/bcm_defconfig
index 176e842308a8,bede51171d98..000000000000
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@@ -125,6 -126,4 +125,7 @@@ CONFIG_CRC_ITU_T=
  CONFIG_CRC7=y
  CONFIG_XZ_DEC=y
  CONFIG_AVERAGE=y
 +CONFIG_WATCHDOG=y
 +CONFIG_BCM_KONA_WDT=y
 +CONFIG_BCM_KONA_WDT_DEBUG=y
+ CONFIG_PINCTRL_CAPRI=y

Attachment: pgp00000.pgp
Description: PGP signature