Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 May 2006 17:25:05 +0000 (13:25 -0400)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 May 2006 17:25:05 +0000 (13:25 -0400)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Hook up vmsplice into syscall tables.


Trivial merge