diff for duplicates of <52827644.1090708@koalo.de> diff --git a/a/1.txt b/N1/1.txt index 1420b74..4369be9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -42,7 +42,7 @@ index 7389405..facba9e 100644 dma-channel-mask = <0x7f35>; }; + -+ bcm2835_i2s: i2s@7e203000 { ++ bcm2835_i2s: i2s at 7e203000 { + compatible = "brcm,bcm2835-i2s"; + reg = < 0x7e203000 0x20 + 0x7e101098 0x02>; diff --git a/a/content_digest b/N1/content_digest index 93dd67c..8772920 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,7 @@ - "From\0Florian Meier <florian.meier@koalo.de>\0" + "From\0florian.meier@koalo.de (Florian Meier)\0" "Subject\0[RFCv2] ASoC: Add support for BCM2835\0" "Date\0Tue, 12 Nov 2013 19:41:08 +0100\0" - "To\0Liam Girdwood <lgirdwood@gmail.com>" - Mark Brown <broonie@kernel.org> - " Stephen Warren <swarren@wwwdotorg.org>\0" - "Cc\0devicetree <devicetree@vger.kernel.org>" - alsa-devel@alsa-project.org - linux-kernel@vger.kernel.org - linux-rpi-kernel <linux-rpi-kernel@lists.infradead.org> - dmaengine <dmaengine@vger.kernel.org> - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "This driver adds support for digital audio (I2S)\n" @@ -56,7 +48,7 @@ " \t\t\tdma-channel-mask = <0x7f35>;\n" " \t\t};\n" "+\n" - "+\t\tbcm2835_i2s: i2s@7e203000 {\n" + "+\t\tbcm2835_i2s: i2s at 7e203000 {\n" "+\t\t\tcompatible = \"brcm,bcm2835-i2s\";\n" "+\t\t\treg = <\t0x7e203000 0x20\n" "+\t\t\t\t0x7e101098 0x02>;\n" @@ -1122,4 +1114,4 @@ "-- \n" 1.7.9.5 -0ac2b41fe7679edc3c585a8682269e3053e85e8a46ef6c6fd809805d3e35d990 +47ca21796eb08724a5d34d3903ad9cf0750e4d6351a50f6c79401a906ee4c459
diff --git a/a/content_digest b/N2/content_digest index 93dd67c..250a7f0 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,11 +4,11 @@ "To\0Liam Girdwood <lgirdwood@gmail.com>" Mark Brown <broonie@kernel.org> " Stephen Warren <swarren@wwwdotorg.org>\0" - "Cc\0devicetree <devicetree@vger.kernel.org>" - alsa-devel@alsa-project.org - linux-kernel@vger.kernel.org + "Cc\0alsa-devel@alsa-project.org" linux-rpi-kernel <linux-rpi-kernel@lists.infradead.org> + devicetree <devicetree@vger.kernel.org> dmaengine <dmaengine@vger.kernel.org> + linux-kernel@vger.kernel.org " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -1122,4 +1122,4 @@ "-- \n" 1.7.9.5 -0ac2b41fe7679edc3c585a8682269e3053e85e8a46ef6c6fd809805d3e35d990 +fbdf3643c0dbfa1b1932b26dea69cac91ce744ed8b7712752755722da3f7a6f1
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.