diff for duplicates of <566F6AEC.1030903@samsung.com> diff --git a/a/1.txt b/N1/1.txt index c886ce8..b6f95e8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -58,7 +58,8 @@ Chanwoo Choi > 4 files changed, 183 insertions(+) > > Index: extcon/Documentation/devicetree/bindings/extcon/extcon-max3355.txt -> =================================> --- /dev/null +> =================================================================== +> --- /dev/null > +++ extcon/Documentation/devicetree/bindings/extcon/extcon-max3355.txt > @@ -0,0 +1,21 @@ > +Maxim Integrated MAX3355 USB OTG chip @@ -83,7 +84,8 @@ Chanwoo Choi > + id-gpios = <&gpio5 31 GPIO_ACTIVE_HIGH>; > + }; > Index: extcon/drivers/extcon/Kconfig -> =================================> --- extcon.orig/drivers/extcon/Kconfig +> =================================================================== +> --- extcon.orig/drivers/extcon/Kconfig > +++ extcon/drivers/extcon/Kconfig > @@ -52,6 +52,14 @@ config EXTCON_MAX14577 > Maxim MAX14577/77836. The MAX14577/77836 MUIC is a USB port accessory @@ -101,7 +103,8 @@ Chanwoo Choi > tristate "Maxim MAX77693 EXTCON Support" > depends on MFD_MAX77693 && INPUT > Index: extcon/drivers/extcon/Makefile -> =================================> --- extcon.orig/drivers/extcon/Makefile +> =================================================================== +> --- extcon.orig/drivers/extcon/Makefile > +++ extcon/drivers/extcon/Makefile > @@ -8,6 +8,7 @@ obj-$(CONFIG_EXTCON_ARIZONA) += extcon-a > obj-$(CONFIG_EXTCON_AXP288) += extcon-axp288.o @@ -112,7 +115,8 @@ Chanwoo Choi > obj-$(CONFIG_EXTCON_MAX77843) += extcon-max77843.o > obj-$(CONFIG_EXTCON_MAX8997) += extcon-max8997.o > Index: extcon/drivers/extcon/extcon-max3355.c -> =================================> --- /dev/null +> =================================================================== +> --- /dev/null > +++ extcon/drivers/extcon/extcon-max3355.c > @@ -0,0 +1,153 @@ > +/* diff --git a/a/content_digest b/N1/content_digest index 3900222..e2f24c2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\05045536.UEVncNCOZE@wasted.cogentembedded.com\0" "From\0Chanwoo Choi <cw00.choi@samsung.com>\0" "Subject\0Re: [PATCH v2] extcon: add Maxim MAX3355 driver\0" - "Date\0Tue, 15 Dec 2015 01:20:44 +0000\0" + "Date\0Tue, 15 Dec 2015 10:20:44 +0900\0" "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>" robh+dt@kernel.org pawel.moll@arm.com @@ -75,7 +75,8 @@ "> 4 files changed, 183 insertions(+)\n" "> \n" "> Index: extcon/Documentation/devicetree/bindings/extcon/extcon-max3355.txt\n" - "> =================================> --- /dev/null\n" + "> ===================================================================\n" + "> --- /dev/null\n" "> +++ extcon/Documentation/devicetree/bindings/extcon/extcon-max3355.txt\n" "> @@ -0,0 +1,21 @@\n" "> +Maxim Integrated MAX3355 USB OTG chip\n" @@ -100,7 +101,8 @@ "> +\t\tid-gpios = <&gpio5 31 GPIO_ACTIVE_HIGH>;\n" "> +\t};\n" "> Index: extcon/drivers/extcon/Kconfig\n" - "> =================================> --- extcon.orig/drivers/extcon/Kconfig\n" + "> ===================================================================\n" + "> --- extcon.orig/drivers/extcon/Kconfig\n" "> +++ extcon/drivers/extcon/Kconfig\n" "> @@ -52,6 +52,14 @@ config EXTCON_MAX14577\n" "> \t Maxim MAX14577/77836. The MAX14577/77836 MUIC is a USB port accessory\n" @@ -118,7 +120,8 @@ "> \ttristate \"Maxim MAX77693 EXTCON Support\"\n" "> \tdepends on MFD_MAX77693 && INPUT\n" "> Index: extcon/drivers/extcon/Makefile\n" - "> =================================> --- extcon.orig/drivers/extcon/Makefile\n" + "> ===================================================================\n" + "> --- extcon.orig/drivers/extcon/Makefile\n" "> +++ extcon/drivers/extcon/Makefile\n" "> @@ -8,6 +8,7 @@ obj-$(CONFIG_EXTCON_ARIZONA)\t+= extcon-a\n" "> obj-$(CONFIG_EXTCON_AXP288)\t+= extcon-axp288.o\n" @@ -129,7 +132,8 @@ "> obj-$(CONFIG_EXTCON_MAX77843)\t+= extcon-max77843.o\n" "> obj-$(CONFIG_EXTCON_MAX8997)\t+= extcon-max8997.o\n" "> Index: extcon/drivers/extcon/extcon-max3355.c\n" - "> =================================> --- /dev/null\n" + "> ===================================================================\n" + "> --- /dev/null\n" "> +++ extcon/drivers/extcon/extcon-max3355.c\n" "> @@ -0,0 +1,153 @@\n" "> +/*\n" @@ -294,4 +298,4 @@ "> \n" > -590be57ead658d3009f8f0613daeebcff40dfbdb364670aecc69cebaa2dcf437 +65353507d16758239b24dd174fb7325ee6b8825d9b66330157a92d9e93292818
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.