Pull virt-cpu-accounting into release branch

author Tony Luck <tony.luck@intel.com>

Thu, 17 Apr 2008 17:12:27 +0000 (10:12 -0700)

committer Tony Luck <tony.luck@intel.com>

Thu, 17 Apr 2008 17:12:27 +0000 (10:12 -0700)
author Tony Luck <tony.luck@intel.com>
Thu, 17 Apr 2008 17:12:27 +0000 (10:12 -0700)
committer Tony Luck <tony.luck@intel.com>
Thu, 17 Apr 2008 17:12:27 +0000 (10:12 -0700)
diff --cc arch/ia64/Kconfig
Simple merge
diff --cc arch/ia64/kernel/fsys.S
Simple merge
author	Tony Luck <tony.luck@intel.com>
	Thu, 17 Apr 2008 17:12:27 +0000 (10:12 -0700)
committer	Tony Luck <tony.luck@intel.com>
	Thu, 17 Apr 2008 17:12:27 +0000 (10:12 -0700)
		1	2
arch/ia64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/fsys.S	patch \|	diff1 \|	diff2 \|	blob \| history