linux-next: manual merge of the arm-soc tree with the pinctrl tree
From: Stephen Rothwell <hidden>
Date: 2012-12-21 02:20:32
Also in:
linux-arm-kernel, lkml
Hi all,
Today's linux-next merge of the arm-soc tree got conflicts in
drivers/pinctrl/pinctrl-exynos5440.c and
drivers/pinctrl/pinctrl-samsung.c between commit e5b4c9d4ab55 ("pinctrl:
exynos5440: Fix compile error in pinctrl-exynos5440/samsung.c") from the
pinctrl tree and commit d5fd5da290ce ("pinctrl: exynos5440/samsung:
Staticize pcfgs") from the arm-soc tree.
The former is a superset of the latter, so I used that (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au Attachments
- (unnamed) [application/pgp-signature] 836 bytes