Re: [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs

2014-02-05 Thread Chanwoo Choi
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

Re: [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs

2014-02-05 Thread Lee Jones
> > 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 >

Re: [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs

2014-02-05 Thread Krzysztof Kozlowski
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

Re: [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs

2014-02-05 Thread Krzysztof Kozlowski
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

Re: [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs

2014-02-05 Thread Lee Jones
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

Re: [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs

2014-02-05 Thread Chanwoo Choi
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

Re: [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs

2014-02-04 Thread Chanwoo Choi
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

Re: [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs

2014-02-04 Thread Chanwoo Choi
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

[PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs

2014-01-28 Thread Krzysztof Kozlowski
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

[PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs

2014-01-28 Thread Krzysztof Kozlowski
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