Messages in this thread | | | Date | Mon, 7 Apr 2014 10:21:02 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the tree |
| |
Hi all,
Today's linux-next merge of the arm-soc tree got conflicts in arch/arm/boot/dts/qcom-msm8960.dtsi, arch/arm/boot/dts/qcom-msm8974.dtsi, arch/arm/mach-omap2/pdata-quirks.c, arch/arm/mach-zynq/Kconfig, drivers/watchdog/Kconfig and sound/soc/kirkwood/Kconfig between various merge commits from Linus' tree and various merge commits from the arm-soc tree.
I used the versions from Linus' tree.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |