Pull nptcg into release branch
authorTony Luck <tony.luck@intel.com>
Thu, 17 Apr 2008 17:13:57 +0000 (10:13 -0700)
committerTony Luck <tony.luck@intel.com>
Thu, 17 Apr 2008 17:13:57 +0000 (10:13 -0700)
Conflicts:

arch/ia64/mm/tlb.c


Trivial merge