0d18b62
parent a3b5960ebd660c9ab92fce9a01d1905ff9b981cb
parent ccefb5f3f60cd116d9a8ce2fa9e82e67206e49e5
author Linus Torvalds <torvalds@g5.osdl.org> 1150145203 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1150145203 -0700

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
ã$˜Iœ