thor Tony Luck <tony.luck@intel.com> 1208452437 -0700
committer Tony Luck <tony.luck@intel.com> 1208452437 -0700

Pull nptcg into release branch

Conflicts:

	arch/ia64/mm/tlb.c
g:aؗ"x