diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 13:46:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 13:46:43 -0700 |
| commit | 5f856e8bdcf5936c9c13cb251dae770e6eeb06b6 (patch) | |
| tree | a64105f06bfdd583f2c58d225255769f50d18b62 /mm | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [SPARC64]: Do not double-export sys_close() when CONFIG_SOLARIS_EMUL_MODULE (diff) | |
| download | linux-dev-5f856e8bdcf5936c9c13cb251dae770e6eeb06b6.tar.xz linux-dev-5f856e8bdcf5936c9c13cb251dae770e6eeb06b6.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]: Do not double-export sys_close() when CONFIG_SOLARIS_EMUL_MODULE
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions