diff for duplicates of <200701270157.43631.lenb@kernel.org> diff --git a/a/1.txt b/N1/1.txt index ca50ff6..df51d86 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,8 +8,7 @@ Signed-off-by: Len Brown <len.brown@intel.com 3 files changed, 26 insertions(+), 7 deletions(-) Index: acpi/arch/ia64/sn/kernel/io_common.c -=================================================================== ---- acpi.orig/arch/ia64/sn/kernel/io_common.c +=================================--- acpi.orig/arch/ia64/sn/kernel/io_common.c +++ acpi/arch/ia64/sn/kernel/io_common.c @@ -25,6 +25,7 @@ #include "xtalk/xwidgetdev.h" @@ -64,8 +63,7 @@ Index: acpi/arch/ia64/sn/kernel/io_common.c else sn_io_init(); Index: acpi/arch/ia64/sn/kernel/iomv.c -=================================================================== ---- acpi.orig/arch/ia64/sn/kernel/iomv.c +=================================--- acpi.orig/arch/ia64/sn/kernel/iomv.c +++ acpi/arch/ia64/sn/kernel/iomv.c @@ -16,6 +16,7 @@ #include <asm/sn/pda.h> @@ -94,8 +92,7 @@ Index: acpi/arch/ia64/sn/kernel/iomv.c else return ((void *)(port | __IA64_UNCACHED_OFFSET)); Index: acpi/include/asm-ia64/sn/acpi.h -=================================================================== ---- /dev/null +=================================--- /dev/null +++ acpi/include/asm-ia64/sn/acpi.h @@ -0,0 +1,18 @@ +/* diff --git a/a/content_digest b/N1/content_digest index f91bb88..f84b68a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0200701270155.18596.lenb@kernel.org\0" "From\0Len Brown <lenb@kernel.org>\0" "Subject\0[PATCH 1/3] - ACPICA: reduce conflicts with Altix patch series\0" - "Date\0Sat, 27 Jan 2007 01:57:43 -0500\0" + "Date\0Sat, 27 Jan 2007 06:57:43 +0000\0" "To\0Andrew Morton <akpm@osdl.org>\0" "Cc\0John Keller <jpk@sgi.com>" linux-acpi@vger.kernel.org @@ -28,8 +28,7 @@ " 3 files changed, 26 insertions(+), 7 deletions(-)\n" "\n" "Index: acpi/arch/ia64/sn/kernel/io_common.c\n" - "===================================================================\n" - "--- acpi.orig/arch/ia64/sn/kernel/io_common.c\n" + "=================================--- acpi.orig/arch/ia64/sn/kernel/io_common.c\n" "+++ acpi/arch/ia64/sn/kernel/io_common.c\n" "@@ -25,6 +25,7 @@\n" " #include \"xtalk/xwidgetdev.h\"\n" @@ -84,8 +83,7 @@ " \telse\n" " \t\tsn_io_init();\n" "Index: acpi/arch/ia64/sn/kernel/iomv.c\n" - "===================================================================\n" - "--- acpi.orig/arch/ia64/sn/kernel/iomv.c\n" + "=================================--- acpi.orig/arch/ia64/sn/kernel/iomv.c\n" "+++ acpi/arch/ia64/sn/kernel/iomv.c\n" "@@ -16,6 +16,7 @@\n" " #include <asm/sn/pda.h>\n" @@ -114,8 +112,7 @@ " \t\telse\n" " \t\t\treturn ((void *)(port | __IA64_UNCACHED_OFFSET));\n" "Index: acpi/include/asm-ia64/sn/acpi.h\n" - "===================================================================\n" - "--- /dev/null\n" + "=================================--- /dev/null\n" "+++ acpi/include/asm-ia64/sn/acpi.h\n" "@@ -0,0 +1,18 @@\n" "+/*\n" @@ -137,4 +134,4 @@ "+\n" +#endif /* _ASM_IA64_SN_ACPI_H */ -3d3c9c9da23d184c03d4fc67aed2d35bc53ef33fc8fc4a6afb2dd1613bdc6039 +ed7b4990e59fe3afca9259ebb5f7a663720d97e067b07b80206ff15e0306fd02
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.