| commit | 5f856e8bdcf5936c9c13cb251dae770e6eeb06b6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Jun 12 13:46:43 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Jun 12 13:46:43 2006 -0700 |
| tree | a64105f06bfdd583f2c58d225255769f50d18b62 | |
| parent | a3b5960ebd660c9ab92fce9a01d1905ff9b981cb [diff] | |
| parent | ccefb5f3f60cd116d9a8ce2fa9e82e67206e49e5 [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]: Do not double-export sys_close() when CONFIG_SOLARIS_EMUL_MODULE