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

Conflicts:

arch/ia64/mm/tlb.c
Documentation/kernel-parameters.txt
arch/ia64/kernel/setup.c
arch/ia64/mm/tlb.c