diff for duplicates of <4FF133F9.50704@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 7932caf..05de895 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,14 +21,14 @@ Huang Shijie wrote: > --- a/arch/arm/boot/dts/imx6q-arm2.dts > +++ b/arch/arm/boot/dts/imx6q-arm2.dts > @@ -25,7 +25,7 @@ -> gpmi-nand@00112000 { +> gpmi-nand at 00112000 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_gpmi_nand_1>; > - status = "disabled"; /* gpmi nand conflicts with SD */ > + status = "okay"; /* gpmi nand conflicts with SD */ > }; > -> aips-bus@02100000 { /* AIPS2 */ +> aips-bus at 02100000 { /* AIPS2 */ > diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c > index a1f4332..c3778c0 100644 > --- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c diff --git a/a/content_digest b/N1/content_digest index dff7dc9..071c10a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,9 @@ "ref\01341200327-8144-1-git-send-email-shijie8@gmail.com\0" "ref\01341200327-8144-4-git-send-email-shijie8@gmail.com\0" - "From\0Hui Wang <jason77.wang@gmail.com>\0" - "Subject\0Re: [PATCH v3 3/3] mtd: gpmi: change the code for clocks\0" + "From\0jason77.wang@gmail.com (Hui Wang)\0" + "Subject\0[PATCH v3 3/3] mtd: gpmi: change the code for clocks\0" "Date\0Mon, 2 Jul 2012 13:39:05 +0800\0" - "To\0Huang Shijie <shijie8@gmail.com>\0" - "Cc\0shawn.guo@linaro.org" - linux-mtd@lists.infradead.org - linux-arm-kernel@lists.infradead.org - dong.aisheng@linaro.org - " dedekind1@gmail.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Huang Shijie wrote:\n" @@ -34,14 +29,14 @@ "> --- a/arch/arm/boot/dts/imx6q-arm2.dts\n" "> +++ b/arch/arm/boot/dts/imx6q-arm2.dts\n" "> @@ -25,7 +25,7 @@\n" - "> \t\tgpmi-nand@00112000 {\n" + "> \t\tgpmi-nand at 00112000 {\n" "> \t\t\tpinctrl-names = \"default\";\n" "> \t\t\tpinctrl-0 = <&pinctrl_gpmi_nand_1>;\n" "> -\t\t\tstatus = \"disabled\"; /* gpmi nand conflicts with SD */\n" "> +\t\t\tstatus = \"okay\"; /* gpmi nand conflicts with SD */\n" "> \t\t};\n" "> \n" - "> \t\taips-bus@02100000 { /* AIPS2 */\n" + "> \t\taips-bus at 02100000 { /* AIPS2 */\n" "> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c\n" "> index a1f4332..c3778c0 100644\n" "> --- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c\n" @@ -90,4 +85,4 @@ "> +\n" > -3d867436acad2a42aa0622edab0f80fbfdb094b3d39d5fe7df5a17417327d077 +94000e4763ff7f70f5eec6c137b524326a07f4fe2330fbb9930d6c5b03ab4fe0
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.