> Hi Lee,
Morning Stephen.
> Today's linux-next merge of the mfd tree got a conflict in:
>
> drivers/acpi/scan.c
>
> between commit:
>
> 68c6b148daa6 ("ACPI / scan: Move device matching code to bus.c")
>
> from the pm tree and commit:
>
> 712e960f0ee9 ("ACPI / PM: Attach ACPI power domain only once")
>
> from the mfd tree.
I believe this will go away when Rafael pulls [0]
[0] http://www.kernelhub.org/?msg=803290&p=2
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
