]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Jun 2006 20:46:43 +0000 (13:46 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Jun 2006 20:46:43 +0000 (13:46 -0700)
commit8dddff611fa8a6733d5b08d9d8f1092cbc177ae5
treea64105f06bfdd583f2c58d225255769f50d18b62
parent859cc2d3a447d9fa32b94917b5af456609bae97b
parent6df0270cfbd07ff3a3f4622039405fe927d79c15
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