diff for duplicates of <1111177190.13286.48.camel@eeyore> diff --git a/a/1.txt b/N1/1.txt index 882aa5a..b188a00 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,8 +11,7 @@ This patch may be used under either the GPL or the BSD license. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> -===== arch/ia64/kernel/acpi-ext.c 1.5 vs edited ===== ---- 1.5/arch/ia64/kernel/acpi-ext.c 2004-10-05 12:19:50 -06:00 +=== arch/ia64/kernel/acpi-ext.c 1.5 vs edited ==--- 1.5/arch/ia64/kernel/acpi-ext.c 2004-10-05 12:19:50 -06:00 +++ edited/arch/ia64/kernel/acpi-ext.c 2005-03-18 11:29:18 -07:00 @@ -12,89 +12,35 @@ #include <linux/module.h> @@ -117,8 +116,7 @@ Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> } EXPORT_SYMBOL(hp_acpi_csr_space); -===== drivers/acpi/resources/rsxface.c 1.22 vs edited ===== ---- 1.22/drivers/acpi/resources/rsxface.c 2005-01-20 22:17:54 -07:00 +=== drivers/acpi/resources/rsxface.c 1.22 vs edited ==--- 1.22/drivers/acpi/resources/rsxface.c 2005-01-20 22:17:54 -07:00 +++ edited/drivers/acpi/resources/rsxface.c 2005-03-18 12:24:34 -07:00 @@ -435,3 +435,90 @@ } @@ -211,8 +209,7 @@ Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> + return AE_OK; +} +EXPORT_SYMBOL(acpi_find_vendor_resource); -===== include/acpi/acpixf.h 1.31 vs edited ===== ---- 1.31/include/acpi/acpixf.h 2005-01-20 22:17:55 -07:00 +=== include/acpi/acpixf.h 1.31 vs edited ==--- 1.31/include/acpi/acpixf.h 2005-01-20 22:17:55 -07:00 +++ edited/include/acpi/acpixf.h 2005-03-18 12:09:12 -07:00 @@ -425,10 +425,10 @@ @@ -244,8 +241,7 @@ Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> /* * Hardware (ACPI device) interfaces -===== include/acpi/actypes.h 1.41 vs edited ===== ---- 1.41/include/acpi/actypes.h 2005-01-20 22:17:55 -07:00 +=== include/acpi/actypes.h 1.41 vs edited ==--- 1.41/include/acpi/actypes.h 2005-01-20 22:17:55 -07:00 +++ edited/include/acpi/actypes.h 2005-03-18 11:23:21 -07:00 @@ -1045,6 +1045,16 @@ #define ACPI_PRODUCER (u8) 0x00 diff --git a/a/content_digest b/N1/content_digest index 3568dcc..f1f39c6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Bjorn Helgaas <bjorn.helgaas@hp.com>\0" "Subject\0[PATCH] ACPI: implement UUID-labelled vendor-defined resources\0" - "Date\0Fri, 18 Mar 2005 13:19:50 -0700\0" + "Date\0Fri, 18 Mar 2005 20:19:50 +0000\0" "To\0ACPI List <acpi-devel@lists.sourceforge.net>" " linux-ia64 <linux-ia64@vger.kernel.org>\0" "\00:1\0" @@ -18,8 +18,7 @@ "\n" "Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>\n" "\n" - "===== arch/ia64/kernel/acpi-ext.c 1.5 vs edited =====\n" - "--- 1.5/arch/ia64/kernel/acpi-ext.c\t2004-10-05 12:19:50 -06:00\n" + "=== arch/ia64/kernel/acpi-ext.c 1.5 vs edited ==--- 1.5/arch/ia64/kernel/acpi-ext.c\t2004-10-05 12:19:50 -06:00\n" "+++ edited/arch/ia64/kernel/acpi-ext.c\t2005-03-18 11:29:18 -07:00\n" "@@ -12,89 +12,35 @@\n" " #include <linux/module.h>\n" @@ -124,8 +123,7 @@ " }\n" " \n" " EXPORT_SYMBOL(hp_acpi_csr_space);\n" - "===== drivers/acpi/resources/rsxface.c 1.22 vs edited =====\n" - "--- 1.22/drivers/acpi/resources/rsxface.c\t2005-01-20 22:17:54 -07:00\n" + "=== drivers/acpi/resources/rsxface.c 1.22 vs edited ==--- 1.22/drivers/acpi/resources/rsxface.c\t2005-01-20 22:17:54 -07:00\n" "+++ edited/drivers/acpi/resources/rsxface.c\t2005-03-18 12:24:34 -07:00\n" "@@ -435,3 +435,90 @@\n" " }\n" @@ -218,8 +216,7 @@ "+\treturn AE_OK;\n" "+}\n" "+EXPORT_SYMBOL(acpi_find_vendor_resource);\n" - "===== include/acpi/acpixf.h 1.31 vs edited =====\n" - "--- 1.31/include/acpi/acpixf.h\t2005-01-20 22:17:55 -07:00\n" + "=== include/acpi/acpixf.h 1.31 vs edited ==--- 1.31/include/acpi/acpixf.h\t2005-01-20 22:17:55 -07:00\n" "+++ edited/include/acpi/acpixf.h\t2005-03-18 12:09:12 -07:00\n" "@@ -425,10 +425,10 @@\n" " \n" @@ -251,8 +248,7 @@ " \n" " /*\n" " * Hardware (ACPI device) interfaces\n" - "===== include/acpi/actypes.h 1.41 vs edited =====\n" - "--- 1.41/include/acpi/actypes.h\t2005-01-20 22:17:55 -07:00\n" + "=== include/acpi/actypes.h 1.41 vs edited ==--- 1.41/include/acpi/actypes.h\t2005-01-20 22:17:55 -07:00\n" "+++ edited/include/acpi/actypes.h\t2005-03-18 11:23:21 -07:00\n" "@@ -1045,6 +1045,16 @@\n" " #define ACPI_PRODUCER (u8) 0x00\n" @@ -291,4 +287,4 @@ " \n" struct acpi_resource_end_tag -702a582e7e13bfe10477f43c208926b859f8a9028c2de4211e6d59db28780055 +e0b4acb345f0a41abcc224dfd53583d38cad97c0a70b226bc039bb9d2ee9fb6f
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.