diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 19:56:57 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 19:56:57 +0100 |
commit | d04ef3a795b3b7b376a02713ed5e211e9ae1f917 (patch) | |
tree | 837da034751a2fc1be0fc5a105c218d41a498eb6 /Kbuild | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | [SPARC64]: Add a secondary TSB for hugepage mappings. (diff) | |
download | linux-d04ef3a795b3b7b376a02713ed5e211e9ae1f917.tar.xz linux-d04ef3a795b3b7b376a02713ed5e211e9ae1f917.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Add a secondary TSB for hugepage mappings.
[SPARC]: Respect vm_page_prot in io_remap_page_range().
Diffstat (limited to 'Kbuild')
0 files changed, 0 insertions, 0 deletions