diff for duplicates of <55085605.2000001@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 26b1fe5..a30e520 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,19 +1,19 @@ -On 03/16/15 23:55, Andreas Färber wrote: +On 03/16/15 23:55, Andreas F?rber wrote: > Am 19.02.2015 um 12:46 schrieb Javier Martinez Canillas: >> Hello Andreas, >> Hi, ->> On 02/18/2015 05:10 PM, Andreas Färber wrote: +>> On 02/18/2015 05:10 PM, Andreas F?rber wrote: >>> Resolve a merge conflict with mmc refactoring aaa25a5a33cb ("ARM: dts: >>> unuse the slot-node and deprecate the supports-highspeed for dw-mmc in ->>> exynos") by dropping the slot@0 nodes, moving its bus-width property to +>>> exynos") by dropping the slot at 0 nodes, moving its bus-width property to >>> the mmc node and replacing supports-highspeed with cap-{mmc,sd}-highspeed, >>> matching exynos5250-snow. >>> >>> Cc: Jaehoon Chung <jh80.chung@samsung.com> >>> Fixes: 53dd4138bb0a ("ARM: dts: Add exynos5250-spring device tree") ->>> Signed-off-by: Andreas Färber <afaerber@suse.de> +>>> Signed-off-by: Andreas F?rber <afaerber@suse.de> >>> --- >>> arch/arm/boot/dts/exynos5250-spring.dts | 16 ++++------------ >>> 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/a/content_digest b/N1/content_digest index ce35ee0..b5fc2d9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,44 +1,28 @@ "ref\01424275812-6797-1-git-send-email-afaerber@suse.de\0" "ref\054E5CD2E.9070608@collabora.co.uk\0" "ref\05506EEF9.7080100@suse.de\0" - "From\0Kukjin Kim <kgene@kernel.org>\0" - "Subject\0Re: [PATCH] ARM: dts: Update exynos5250-spring with mmc node changes\0" + "From\0kgene@kernel.org (Kukjin Kim)\0" + "Subject\0[PATCH] ARM: dts: Update exynos5250-spring with mmc node changes\0" "Date\0Wed, 18 Mar 2015 01:27:49 +0900\0" - "To\0Andreas F\303\244rber <afaerber@suse.de>\0" - "Cc\0linux-samsung-soc@vger.kernel.org" - Kukjin Kim <kgene@kernel.org> - Javier Martinez Canillas <javier.martinez@collabora.co.uk> - linux-arm-kernel@lists.infradead.org - devicetree@vger.kernel.org - Vincent Palatin <vpalatin@chromium.org> - Doug Anderson <dianders@chromium.org> - Tomasz Figa <t.figa@samsung.com> - Jaehoon Chung <jh80.chung@samsung.com> - Rob Herring <robh+dt@kernel.org> - Pawel Moll <pawel.moll@arm.com> - Mark Rutland <mark.rutland@arm.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - Kumar Gala <galak@codeaurora.org> - Russell King <linux@arm.linux.org.uk> - " LKML <linux-kernel@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On 03/16/15 23:55, Andreas F\303\244rber wrote:\n" + "On 03/16/15 23:55, Andreas F?rber wrote:\n" "> Am 19.02.2015 um 12:46 schrieb Javier Martinez Canillas:\n" ">> Hello Andreas,\n" ">>\n" "Hi,\n" "\n" - ">> On 02/18/2015 05:10 PM, Andreas F\303\244rber wrote:\n" + ">> On 02/18/2015 05:10 PM, Andreas F?rber wrote:\n" ">>> Resolve a merge conflict with mmc refactoring aaa25a5a33cb (\"ARM: dts:\n" ">>> unuse the slot-node and deprecate the supports-highspeed for dw-mmc in\n" - ">>> exynos\") by dropping the slot@0 nodes, moving its bus-width property to\n" + ">>> exynos\") by dropping the slot at 0 nodes, moving its bus-width property to\n" ">>> the mmc node and replacing supports-highspeed with cap-{mmc,sd}-highspeed,\n" ">>> matching exynos5250-snow.\n" ">>>\n" ">>> Cc: Jaehoon Chung <jh80.chung@samsung.com>\n" ">>> Fixes: 53dd4138bb0a (\"ARM: dts: Add exynos5250-spring device tree\")\n" - ">>> Signed-off-by: Andreas F\303\244rber <afaerber@suse.de>\n" + ">>> Signed-off-by: Andreas F?rber <afaerber@suse.de>\n" ">>> ---\n" ">>> arch/arm/boot/dts/exynos5250-spring.dts | 16 ++++------------\n" ">>> 1 file changed, 4 insertions(+), 12 deletions(-)\n" @@ -52,4 +36,4 @@ "\n" - Kukjin -2eee42d61b0365d7b8bc8baf64414db9d85ea1acff9277100c579b80288f8c02 +d814f7932814c2ce461f43fd18e245333f6b0edef48b5082a86298ac9ce9d2c8
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.