From: Linus Torvalds <torvalds@g5.osdl.org>
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: http://review.tizen.org/git/?a=commitdiff_plain;h=5f856e8bdcf5936c9c13cb251dae770e6eeb06b6;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge /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