On 02/05/2014 11:04 PM, Lee Jones wrote:
>>> Following patch has conflict on extcon-next branch(Linus 3.14-rc1)
>>> when apply patchset by using git am.
>>>
>>> [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
>>> [PATCH 12/18] extcon: m
> > Following patch has conflict on extcon-next branch(Linus 3.14-rc1)
> > when apply patchset by using git am.
> >
> > [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
> > [PATCH 12/18] extcon: max14577: Choose muic_irqs according to device type
>
On Wed, 2014-02-05 at 09:47 +0900, Chanwoo Choi wrote:
> Hi Krzysztof,
>
> Following patch has conflict on extcon-next branch(Linus 3.14-rc1)
> when apply patchset by using git am.
>
> [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
> [PATCH 12/18] ext
On Wed, 2014-02-05 at 09:47 +0900, Chanwoo Choi wrote:
Hi Krzysztof,
Following patch has conflict on extcon-next branch(Linus 3.14-rc1)
when apply patchset by using git am.
[PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
[PATCH 12/18] extcon: max14577: Choose muic_irqs
Following patch has conflict on extcon-next branch(Linus 3.14-rc1)
when apply patchset by using git am.
[PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
[PATCH 12/18] extcon: max14577: Choose muic_irqs according to device type
[PATCH 14/18] extcon: max14577: Add
On 02/05/2014 11:04 PM, Lee Jones wrote:
Following patch has conflict on extcon-next branch(Linus 3.14-rc1)
when apply patchset by using git am.
[PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
[PATCH 12/18] extcon: max14577: Choose muic_irqs according to device type
[PATCH
Hi Krzysztof,
Following patch has conflict on extcon-next branch(Linus 3.14-rc1)
when apply patchset by using git am.
[PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
[PATCH 12/18] extcon: max14577: Choose muic_irqs according to device type
[PATCH 14/18] extcon: max14577: Add
Hi Krzysztof,
Following patch has conflict on extcon-next branch(Linus 3.14-rc1)
when apply patchset by using git am.
[PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
[PATCH 12/18] extcon: max14577: Choose muic_irqs according to device type
[PATCH 14/18] extcon: max14577: Add
Add max14577 prefix to muic_irqs array. This prepares for max77836
support in this extcon driver.
Signed-off-by: Krzysztof Kozlowski
Cc: Kyungmin Park
Cc: Marek Szyprowski
---
drivers/extcon/extcon-max14577.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
Add max14577 prefix to muic_irqs array. This prepares for max77836
support in this extcon driver.
Signed-off-by: Krzysztof Kozlowski k.kozlow...@samsung.com
Cc: Kyungmin Park kyungmin.p...@samsung.com
Cc: Marek Szyprowski m.szyprow...@samsung.com
---
drivers/extcon/extcon-max14577.c | 12
10 matches
Mail list logo