| commit | d04ef3a795b3b7b376a02713ed5e211e9ae1f917 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Mar 22 10:56:57 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Mar 22 10:56:57 2006 -0800 |
| tree | 837da034751a2fc1be0fc5a105c218d41a498eb6 | |
| parent | 36177ba655c238e33400cc2837a28720b62784bd [diff] | |
| parent | dcc1e8dd88d4bc55e32a26dad7633d20ffe606d2 [diff] |
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().