From: Linus Torvalds Date: Mon, 12 Jun 2006 20:46:43 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: v2.6.17~19 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f856e8bdcf5936c9c13cb251dae770e6eeb06b6;p=linux-2.6 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 --- 5f856e8bdcf5936c9c13cb251dae770e6eeb06b6