diff for duplicates of <20120126235326.GD29812@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 91d5b82..7bc07d7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,22 +16,22 @@ > >> --- > >> applies both on mainline and hsmmc branch. > >> -> >> arch/arm/mach-omap2/hsmmc.c | 7 +++---- -> >> 1 files changed, 3 insertions(+), 4 deletions(-) +> >> ?arch/arm/mach-omap2/hsmmc.c | ? ?7 +++---- +> >> ?1 files changed, 3 insertions(+), 4 deletions(-) > >> > >> diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c > >> index f4a1020..d90ac08 100644 > >> --- a/arch/arm/mach-omap2/hsmmc.c > >> +++ b/arch/arm/mach-omap2/hsmmc.c > >> @@ -171,7 +171,7 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot, -> >> } -> >> } +> >> ? ? ? } +> >> ?} > >> > >> -static void hsmmc23_before_set_reg(struct device *dev, int slot, > >> +static void hsmmc2_before_set_reg(struct device *dev, int slot, -> >> int power_on, int vdd) -> >> { -> >> struct omap_mmc_platform_data *mmc = dev->platform_data; +> >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?int power_on, int vdd) +> >> ?{ +> >> ? ? ? struct omap_mmc_platform_data *mmc = dev->platform_data; > > > > This hunk above changing the function name seems to be a typo? > @@ -42,7 +42,3 @@ OK thanks, applying into fixes. Tony --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index f21f940..3a187c9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,10 @@ "ref\01324168547-26569-1-git-send-email-notasas@gmail.com\0" "ref\020120126231921.GA29812@atomide.com\0" "ref\0CANOLnOPSwj-swMYR8CmFOf-Y0GWvdN-BQtneX4WLv87FwWTbtg@mail.gmail.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH] ARM: OMAP: fix erroneous mmc2 clock change on mmc3 setup\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH] ARM: OMAP: fix erroneous mmc2 clock change on mmc3 setup\0" "Date\0Thu, 26 Jan 2012 15:53:27 -0800\0" - "To\0Grazvydas Ignotas <notasas@gmail.com>\0" - "Cc\0linux-omap@vger.kernel.org" - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Grazvydas Ignotas <notasas@gmail.com> [120126 15:06]:\n" @@ -27,22 +25,22 @@ "> >> ---\n" "> >> applies both on mainline and hsmmc branch.\n" "> >>\n" - "> >> \302\240arch/arm/mach-omap2/hsmmc.c | \302\240 \302\2407 +++----\n" - "> >> \302\2401 files changed, 3 insertions(+), 4 deletions(-)\n" + "> >> ?arch/arm/mach-omap2/hsmmc.c | ? ?7 +++----\n" + "> >> ?1 files changed, 3 insertions(+), 4 deletions(-)\n" "> >>\n" "> >> diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c\n" "> >> index f4a1020..d90ac08 100644\n" "> >> --- a/arch/arm/mach-omap2/hsmmc.c\n" "> >> +++ b/arch/arm/mach-omap2/hsmmc.c\n" "> >> @@ -171,7 +171,7 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,\n" - "> >> \302\240 \302\240 \302\240 }\n" - "> >> \302\240}\n" + "> >> ? ? ? }\n" + "> >> ?}\n" "> >>\n" "> >> -static void hsmmc23_before_set_reg(struct device *dev, int slot,\n" "> >> +static void hsmmc2_before_set_reg(struct device *dev, int slot,\n" - "> >> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240int power_on, int vdd)\n" - "> >> \302\240{\n" - "> >> \302\240 \302\240 \302\240 struct omap_mmc_platform_data *mmc = dev->platform_data;\n" + "> >> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?int power_on, int vdd)\n" + "> >> ?{\n" + "> >> ? ? ? struct omap_mmc_platform_data *mmc = dev->platform_data;\n" "> >\n" "> > This hunk above changing the function name seems to be a typo?\n" "> \n" @@ -52,10 +50,6 @@ "\n" "OK thanks, applying into fixes.\n" "\n" - "Tony\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + Tony -dd1a5e4f782776414b4a9f9cf8bc503e99a62be16f21ad38c36bac3e7358eaea +6819c829c13df2f20967923b0eada3a92b85738eb10d3313c0f2a97918dd53e0
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.