On 11/11/14 18:54, Javier Martinez Canillas wrote:
Hello Kukjin,
After this patch, "[PATCH v9 1/2] ARM: EXYNOS: Add platform driver
support for Exynos PMU" [0] does not apply cleanly anymore.
I see that you already picked all the Exynos S2R patches on your
v3.19-next/mach-exynos branch and also resolved that conflict.
Yes, but I couldn't merge it into -next because of some conflicts
between for-next and mach-exynos branch at that time.
Note I've merged into -next just now, so if any problems in -next,
please let us know.
Is just that this branch was not merged in your for-next branch and
that's why I didn't see the patches in linux-next.
Sorry for the noise.
No problem, thanks.
- Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
