Pull model-name into release branch

author Tony Luck <[email protected]>

Tue, 26 Sep 2006 16:47:04 +0000 (09:47 -0700)

committer Tony Luck <[email protected]>

Tue, 26 Sep 2006 16:47:04 +0000 (09:47 -0700)
author Tony Luck <[email protected]>
Tue, 26 Sep 2006 16:47:04 +0000 (09:47 -0700)
committer Tony Luck <[email protected]>
Tue, 26 Sep 2006 16:47:04 +0000 (09:47 -0700)
diff --cc arch/ia64/kernel/setup.c
Simple merge
diff --cc include/asm-ia64/pal.h
Simple merge
diff --cc include/asm-ia64/processor.h
Simple merge
author	Tony Luck <[email protected]>
	Tue, 26 Sep 2006 16:47:04 +0000 (09:47 -0700)
committer	Tony Luck <[email protected]>
	Tue, 26 Sep 2006 16:47:04 +0000 (09:47 -0700)
		1	2
arch/ia64/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-ia64/pal.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-ia64/processor.h	patch \|	diff1 \|	diff2 \|	blob \| history