diff for duplicates of <1362032757.32211.10.camel@gitbox>
diff --git a/a/1.txt b/N1/1.txt
index b0a6900..d78da0e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -46,14 +46,14 @@ Again - this is not a proper patch.
> > diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi
>
> > +/*
-> > gpio: gpio-controller@d8110000 {
+> > gpio: gpio-controller at d8110000 {
> > compatible = "wm,wm8650-gpio";
> > gpio-controller;
> > reg = <0xd8110000 0x10000>;
> > #gpio-cells = <3>;
> > };
> > +*/
-> > + pinmux: pinmux@d8110000 {
+> > + pinmux: pinmux at d8110000 {
> > + compatible = "wm,wm8850-gpio";
> > + reg = <0xd8110000 0x10000>;
> > + };
diff --git a/a/content_digest b/N1/content_digest
index b4ad178..1e9afc9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,22 +8,16 @@
"ref\000512E86F4.6000909\@wwwdotorg.org\0"
]
[
- "From\0Tony Prisk <linux\@prisktech.co.nz>\0"
+ "From\0linux\@prisktech.co.nz (Tony Prisk)\0"
]
[
- "Subject\0Re: [PATCH] pinctrl: gpio: vt8500: Add pin control driver for Wondermedia SoCs\0"
+ "Subject\0[PATCH] pinctrl: gpio: vt8500: Add pin control driver for Wondermedia SoCs\0"
]
[
"Date\0Thu, 28 Feb 2013 19:25:57 +1300\0"
]
[
- "To\0Stephen Warren <swarren\@wwwdotorg.org>\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org",
- " grant.likely\@secretlab.ca",
- " linus.walleij\@linaro.org",
- " linux-kernel\@vger.kernel.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -80,14 +74,14 @@
"> > diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi\n",
"> \n",
"> > +/*\n",
- "> > \t\tgpio: gpio-controller\@d8110000 {\n",
+ "> > \t\tgpio: gpio-controller at d8110000 {\n",
"> > \t\t\tcompatible = \"wm,wm8650-gpio\";\n",
"> > \t\t\tgpio-controller;\n",
"> > \t\t\treg = <0xd8110000 0x10000>;\n",
"> > \t\t\t#gpio-cells = <3>;\n",
"> > \t\t};\n",
"> > +*/\n",
- "> > +\t\tpinmux: pinmux\@d8110000 {\n",
+ "> > +\t\tpinmux: pinmux at d8110000 {\n",
"> > +\t\t\tcompatible = \"wm,wm8850-gpio\";\n",
"> > +\t\t\treg = <0xd8110000 0x10000>;\n",
"> > +\t\t};\n",
@@ -219,4 +213,4 @@
"Agreed."
]
-d73cd9cc1c55c7933c93e41445892dbbfaa655039402464e8ef2ba612fe99629
+af877dfc4c5be65545b890fec1797a8b3e3078f2fbac91ea30a538a7b36a2300
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.