Messages in this thread |  | | Date | Fri, 26 Oct 2012 14:27:08 +1100 | | From | Stephen Rothwell <> | | Subject | linux-next: manual merge of the arm-soc tree with the pinctrl tree |
| |
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-ux500/cpu-db8500.c between commit 63c53906312f ("pinctrl/nomadik: move the platform data header") from the pinctrl tree and commit 4040d10a3d44 ("ARM: ux500: add DB serial number to entropy pool") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-ux500/cpu-db8500.c index 87a8f9f,50202a1..0000000 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@@ -18,7 -18,7 +18,8 @@@ #include <linux/io.h> #include <linux/mfd/abx500/ab8500.h> #include <linux/platform_data/usb-musb-ux500.h> +#include <linux/platform_data/pinctrl-nomadik.h> + #include <linux/random.h> #include <asm/pmu.h> #include <asm/mach/map.h> [unhandled content-type:application/pgp-signature] |  |