Pull nptcg into release branch

Conflicts:

	arch/ia64/mm/tlb.c