| commit | 23344cb341902f4e3431d8137dca93d6e186d054 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Sun Apr 02 12:48:07 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Sun Apr 02 12:48:07 2006 -0700 |
| tree | 2a0e443ade173b80cb0df261f4b2d66f79b9270e | |
| parent | bacd3add087770333bdce65cd3dd25e3b2cd67ac [diff] | |
| parent | 289eee6fa78e999208120c856ef3ae5a817fd59c [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: [SPARC]: Wire up sys_sync_file_range() into syscall tables. [SPARC]: Wire up sys_splice() into the syscall tables. [SPARC64]: Update defconfig. [SPARC64]: Align address in huge_pte_alloc(). [SPARC64]: Document the instruction checks we do in do_sparc64_fault(). [SPARC64]: Make tsb_sync() mm comparison more precise.