Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/work/alex

author Tony Luck <aegl@agluck-lia64.sc.intel.com>

Wed, 22 Sep 2004 23:06:41 +0000 (23:06 +0000)

committer Tony Luck <aegl@agluck-lia64.sc.intel.com>

Wed, 22 Sep 2004 23:06:41 +0000 (23:06 +0000)
author Tony Luck <aegl@agluck-lia64.sc.intel.com>
Wed, 22 Sep 2004 23:06:41 +0000 (23:06 +0000)
committer Tony Luck <aegl@agluck-lia64.sc.intel.com>
Wed, 22 Sep 2004 23:06:41 +0000 (23:06 +0000)
diff --cc arch/ia64/kernel/acpi.c
Simple merge
diff --cc arch/ia64/mm/discontig.c
Simple merge
diff --cc arch/ia64/pci/pci.c
Simple merge
author	Tony Luck <aegl@agluck-lia64.sc.intel.com>
	Wed, 22 Sep 2004 23:06:41 +0000 (23:06 +0000)
committer	Tony Luck <aegl@agluck-lia64.sc.intel.com>
	Wed, 22 Sep 2004 23:06:41 +0000 (23:06 +0000)
		1	2
arch/ia64/kernel/acpi.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/mm/discontig.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/pci/pci.c	patch \|	diff1 \|	diff2 \|	blob \| history