Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.txt
between commit:
8266b4ae7135 ("devicetree: Add vendor prefix for Inverse Path")
from the imx-mxs tree and commit:
a24f7253f26d ("devicetree: Sort vendor prefi
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm/mach-imx/mach-imx51.c
between commit:
463f90fa8a12 ("ARM: i.MX: Disable supervisor protect for i.MX51")
from the imx-mxs tree and commit:
850bea2335e4 ("arm: Remove unnecessary of_platform_populate with
2 matches
Mail list logo