From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 4 May 2006 17:25:05 +0000 (-0400)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.17-rc4~46
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0de2a93e80917c70716c20b8b6a75e5350da3f71;p=linux-2.6

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]: Hook up vmsplice into syscall tables.
---

0de2a93e80917c70716c20b8b6a75e5350da3f71