]> 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>
Thu, 20 Apr 2006 14:58:58 +0000 (07:58 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 20 Apr 2006 14:58:58 +0000 (07:58 -0700)
commit9625fbcf2d6fffc19cb128c31333ee44c74df027
tree765c7e4ee581badf9e7230025b91ca43172695fd
parentf46171fb38cbaf48bd070556604f732e9bca383e
parentb186d674b0daf471203b724a5cadf8bf15dbcfbd
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:
  [SPARC]: __NR_sys_splice --> __NR_splice