| commit | f4df39cbdd9e9ab615e80148cc271db22a8508ad | |
| author | Tony Luck <tony.luck@intel.com> | |
| Thu, 17 Apr 2008 17:13:57 +0000 (17 10:13 -0700) | ||
| committer | Tony Luck <tony.luck@intel.com> | |
| Thu, 17 Apr 2008 17:13:57 +0000 (17 10:13 -0700) | ||
| tree | 312fcf9de1154c85782c121a46fa2952f9812292 | treesnapshot (tar.gz zip) |
| parent | a49072bb367a94a9af6c6a6dcbaa1dc5617d7fa0 | commitdiff |
| parent | a6c75b86ce9f01db4ea9912877b526c2dc4d2f0a | commitdiff |
Pull nptcg into release branch
Conflicts:
arch/ia64/mm/tlb.c
Conflicts:
arch/ia64/mm/tlb.c
| Documentation/kernel-parameters.txt | diff1 | diff2 | blobhistory |
| arch/ia64/kernel/setup.c | diff1 | diff2 | blobhistory |
| arch/ia64/mm/tlb.c | diff1 | diff2 | blobhistory |