[PATCH 2/4] gpio: samsung: Skip registration if pinctrl driver is present on Exynos4x12
Kukjin Kim
kgene.kim at samsung.com
Mon Nov 12 00:03:05 EST 2012
Linus Walleij wrote:
>
> >
> > Can you drop above 3 commits in your tree? If many conflicts happens
> during
> > rebasing, how about that I merge your pinctrl/samsung branch into
> Samsung
> > tree?...
>
> Why not :-)
>
> I have removed the samsung branch from my for-next to avoid
> clashes.
>
Thanks ;-)
> So please bring the samsung branch into you tree and fix
> everything up there.
>
I did.
> Axel Lin has sent some tree-wide cleanups but let's hope they don't
> hit samsung so much, or they will need to be postponed/dropped.
>
OK, I see.
Thanks again.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim at samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
More information about the linux-arm-kernel
mailing list